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

Helius

2022-07-02 97641c088c44dd60f63e697466c73613a1c63262

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