Merge remote-tracking branch 'origin/master'

lin

2024-04-12 b9f32ef5413a1b267f86f79db169386aff61c9e7

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

@@ -182,7 +182,7 @@
    * @param queryWrapper
    * @return
    */
   List<UserExcel> exportUser(Wrapper<User> queryWrapper);
   List<UserExcel> exportUser(Wrapper<User> queryWrapper, String tenantId);

   /**
    * 注册用户