Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

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

@@ -342,5 +342,4 @@
   public R getUserList(UserVO user){
      return R.data(userService.getUserList(user));
   }

}