Merge remote-tracking branch 'origin/master'

zengh

2022-07-19 ec09030f0730809145c97bfaa0bd0387a7d990bf

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