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

xiaoyong931011

2022-07-07 50a170ab1b38e97063e7a32da51e07b939638e8d

 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;