Merge remote-tracking branch 'origin/master'

lin

2024-02-27 cb67dd62a517b1ccba51b47717a4a55cad368acf

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -611,7 +611,7 @@
   }

   @Override
   public List<UserEntity> getUserInfoByDistrictIds(String districtIds) {
   public List<User> getUserInfoByDistrictIds(String districtIds) {
      List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
      return baseMapper.getUserInfoByDistrictIds(list);
   }