Merge remote-tracking branch 'origin/cms' into anentang

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 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;

}