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

Helius

2022-07-07 f04b8922283120e2bc4a476ddc302ebd3b0894e4

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

@@ -47,8 +47,11 @@
    //拓展备注
    private String remark;
    //所属ID
    private Long belongId;
    private Long companyId;

    @TableField(exist = false)
    private String roleName;

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