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

xiaoyong931011

2022-07-12 19befbb8b6ba0f12f7fec0e597edd0f9bce3ec0f

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