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/vo/AdminUserMenuVo.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "菜单类型 1：菜单 2：按钮")
    private Integer menuType;

    @ApiModelProperty(value = "排序")
    private Integer orderNum;

    @ApiModelProperty(value = "路由地址")
    private String routeUrl;