Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve

Helius

2022-08-09 b74faa19bd619213d4de8772b1816c2f87c29449

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