Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -41,9 +41,9 @@ public class UserController {
     @Value("${UMIS.sys_config_path}")
     private String baseDir;
 
-    @ApiOperation(value = "分页查询用户信息")
-    @RequestMapping(value = "/selectPage", method = RequestMethod.POST)
-    public  AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@ApiParam(value = "用户名称或手机号", required = false)@RequestParam String contion,@ApiParam(value = "部门ID", required = false)@RequestParam Long deptId) {
+    @ApiOperation(value = "分页查询用户信息(按参数)")
+    @RequestMapping(value = "/selectPageByParm", method = RequestMethod.POST)
+    public  AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@RequestParam(value = "contion",required = false) String contion,@RequestParam(value = "deptId",required = false) Long deptId) {
         IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
         UserEntity  userEntity = new UserEntity();
         userEntity.setUsername(contion);
@@ -55,8 +55,8 @@ public class UserController {
         Pagination<UserEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
-    @ApiOperation(value = "分页查询用户信息(按参数)")
-    @RequestMapping(value = "/selectPageByParm", method = RequestMethod.POST)
+    @ApiOperation(value = "分页查询用户信息")
+    @RequestMapping(value = "/selectPage", method = RequestMethod.POST)
     public  AjaxMessage<Pagination<UserEntity>> selectPageByParm(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@ApiParam(value = "", required = false)@RequestBody UserEntity userEntity) {
         IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
         iPage = userService.findPage(iPage, userEntity);