Merge remote-tracking branch 'origin/cms' into anentang

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java

@@ -51,4 +51,7 @@

    @TableField(exist = false)
    private String roleName;

    @TableField(exist = false)
    private Long roleId;
}