Merge remote-tracking branch 'origin/master'

lin

2024-02-29 97ad7e7702c7dbcef19d8fc05b23b7357670c6d7

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

@@ -121,5 +121,5 @@
    * @param list
    * @return
    */
   List<UserEntity> getUserInfoByDistrictIds(@Param("list") List<String> list);
   List<User> getUserInfoByDistrictIds(@Param("list") List<String> list);
}