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

xiaoyong931011

2022-07-07 9b02eab3cb3fc2b487e6a3de3992aa3b7d284d40

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

@@ -28,6 +28,6 @@
    //上级类目ID
    private Long parentId;
    //所属ID
    private Long belongId;
    private Long companyId;

}