Merge remote-tracking branch 'origin/master'

zengh

2022-07-19 ec09030f0730809145c97bfaa0bd0387a7d990bf

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -333,4 +333,14 @@
      return R.success("操作成功");
   }

   /**
    * 查询用户信息
    * @param user
    * @return
    */
   @GetMapping("/getUserList")
   public R getUserList(UserVO user){
      return R.data(userService.getUserList(user));
   }

}