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/NavigationBarEntity.java

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

}