From ccdec76633087f920dad190b2bf4f406ad546f8c Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Mon, 25 Jun 2018 21:10:38 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/util/Pagination.java      | 2 +-
 .../java/com/xwbing/controller/sys/SysAuthorityControl.java     | 2 +-
 .../src/main/java/com/xwbing/controller/sys/SysRoleControl.java | 2 +-
 .../src/main/java/com/xwbing/controller/sys/SysUserControl.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/util/Pagination.java b/boot-service/src/main/java/com/xwbing/util/Pagination.java
index 9089c0e..729008a 100644
--- a/boot-service/src/main/java/com/xwbing/util/Pagination.java
+++ b/boot-service/src/main/java/com/xwbing/util/Pagination.java
@@ -19,7 +19,7 @@ import java.util.List;
 public class Pagination<T> {
     @ApiModelProperty(value = "当前页")
     private Integer currentPage = 1;
-    @ApiModelProperty(value = "每页显示的总条数")
+    @ApiModelProperty(value = "每页显示的条数")
     private Integer pageSize = 10;
     @ApiModelProperty(value = "总条数")
     private Long totalNum;
diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
index 4742d6b..6476d10 100644
--- a/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
@@ -104,7 +104,7 @@ public class SysAuthorityControl {
     @ApiOperation(value = "根据是否启用分页查询所有权限", response = PageSysAuthorityVo.class)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "currentPage", value = "当前页", example = "1", paramType = "query", dataType = "int"),
-            @ApiImplicitParam(name = "pageSize", value = "页数", example = "10", paramType = "query", dataType = "int")
+            @ApiImplicitParam(name = "pageSize", value = "每页显示的条数", example = "10", paramType = "query", dataType = "int")
     })
     @GetMapping("pageByEnable")
     public JSONObject pageByEnable(@RequestParam(required = false, defaultValue = "Y") String enable, @ApiIgnore Pagination page) {
diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java
index e3a83cb..274c3e1 100644
--- a/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java
@@ -92,7 +92,7 @@ public class SysRoleControl {
     @ApiOperation(value = "根据是否启用分页查询所有角色", response = PageSysRoleVo.class)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "currentPage", value = "当前页", example = "1", paramType = "query", dataType = "int"),
-            @ApiImplicitParam(name = "pageSize", value = "页数", example = "10", paramType = "query", dataType = "int")
+            @ApiImplicitParam(name = "pageSize", value = "每页显示的条数", example = "10", paramType = "query", dataType = "int")
     })
     @GetMapping("pageByEnable")
     public JSONObject pageByEnable(@RequestParam(required = false, defaultValue = "Y") String enable, @ApiIgnore Pagination page) {
diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
index a7dcad0..67435e0 100644
--- a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
@@ -94,7 +94,7 @@ public class SysUserControl {
     @ApiOperation(value = "查询所有用户", response = PageSysUserVo.class)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "currentPage", value = "当前页", example = "1", paramType = "query", dataType = "int"),
-            @ApiImplicitParam(name = "pageSize", value = "页数", example = "10", paramType = "query", dataType = "int")
+            @ApiImplicitParam(name = "pageSize", value = "每页显示的条数", example = "10", paramType = "query", dataType = "int")
     })
     @GetMapping("page")
     public JSONObject page(@RequestParam(required = false) String name, @RequestParam(required = false, defaultValue = "0") String sex, @ApiIgnore Pagination page) {