Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

KKSU

2024-09-30 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5

 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;
}