Merge remote-tracking branch 'origin/master'

tangzy

2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -212,5 +212,5 @@
    * @param user
    * @return
    */
    List<User> getUserList(User user);
    List<User> getUserList(UserVO user);
}