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

xiaoyong931011

2022-07-07 b9fe4f29593fa980684b37085d3a440bb872356c

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

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

    @TableField(exist = false)
    private String roleName;