Merge remote-tracking branch 'origin/master'

linwe

2024-05-17 1b4822da66a05ee7647f5f86a9f18f15dadb0a25

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -63,7 +63,7 @@
    * @param queryWrapper
    * @return
    */
   List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
   List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper,@Param("deptIdList") List<Long> deptIdList);

   /**
    * 按条件查询用户信息