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

xiaoyong931011

2022-07-05 cee43c11fe6772305e19e7ddee1e8276060046d6

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

@@ -26,5 +26,5 @@
    //拓展备注
    private String remark;
    //所属ID
    private Long belongId;
    private Long companyId;
}