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

xiaoyong931011

2022-06-24 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813

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

@@ -27,4 +27,6 @@
    private String pic;
    //上级类目ID
    private Long parentId;
    //所属ID
    private Long companyId;
}