Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

KKSU

2024-09-30 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5

 src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminNavigationBarVo.java

@@ -19,7 +19,7 @@
    private String linkUrl;
    //描述
    @ApiModelProperty(value = "描述")
    private String describe;
    private String remark;
    //排序
    @ApiModelProperty(value = "排序")
    private Integer orderNum;