he2802 преди 4 години
родител
ревизия
b9700f6e75

+ 0 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysMenuController.java

@@ -43,7 +43,6 @@ public class SysMenuController extends BaseController
      * 获取菜单列表
      */
     @ApiOperation("获取菜单列表")
-    @ApiOperationSupport(includeParameters = {"ignore_all"})
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu)

+ 9 - 0
zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysDictType.java

@@ -79,4 +79,13 @@ public class SysDictType implements Serializable
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 
+
+    /** 分页大小 */
+    @ApiModelProperty("分页大小")
+    @TableField(exist = false)
+    private Integer pageSize;
+    /** 当前页数 */
+    @ApiModelProperty("当前页数")
+    @TableField(exist = false)
+    private Integer pageNum;
 }

+ 6 - 6
zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysMenu.java

@@ -27,12 +27,12 @@ public class SysMenu implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 菜单ID */
-    @ApiModelProperty(value ="菜单ID",required = true)
+    @ApiModelProperty(value ="菜单ID")
     @TableId(value = "menu_id",type = IdType.AUTO)
     private Long menuId;
 
     /** 菜单名称 */
-    @ApiModelProperty(value ="菜单名称",required = true)
+    @ApiModelProperty(value ="菜单名称")
     @NotBlank(message = "菜单名称不能为空")
     @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
     private String menuName;
@@ -42,16 +42,16 @@ public class SysMenu implements Serializable
     private String parentName;
 
     /** 父菜单ID */
-    @ApiModelProperty(value ="父菜单ID",required = true)
+    @ApiModelProperty(value ="父菜单ID")
     private Long parentId;
 
     /** 显示顺序 */
-    @ApiModelProperty(value ="显示顺序",required = true)
+    @ApiModelProperty(value ="显示顺序")
     @NotBlank(message = "显示顺序不能为空")
     private String orderNum;
 
     /** 路由地址 */
-    @ApiModelProperty(value ="路由地址",required = true)
+    @ApiModelProperty(value ="路由地址")
     @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
     private String path;
 
@@ -69,7 +69,7 @@ public class SysMenu implements Serializable
     private String isCache;
 
     /** 类型(M目录 C菜单 F按钮) */
-    @ApiModelProperty(value ="类型(M目录 C菜单 F按钮)",required = true)
+    @ApiModelProperty(value ="类型(M目录 C菜单 F按钮)")
     @NotBlank(message = "菜单类型不能为空")
     private String menuType;