Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

 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));
   }

}