fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

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