fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

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

@@ -24,5 +24,5 @@
    //网页LOGO
    private String webPic;
    //所属ID
    private Long belongId;
    private Long companyId;
}