From 88de0b5169112f8ea908cc2c048bc34286f8851d Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 26 Feb 2024 13:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 02d2ecd..23ac009 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/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);
 	}

--
Gitblit v1.9.3