From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index b124a63..7f61797 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/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);
 
 	/**
 	 * 注册用户
@@ -269,15 +269,6 @@
 	 */
 	void importPoliceUser(List<PoliceUserExcel> data);
 
-	/**
-	 * 通过小区id查询用户
-	 * @param districtIds
-	 * @param building
-	 * @param unit
-	 * @param name
-	 * @return
-	 */
-	IPage<HouseholdVO> getUserInfoByDistrictIds(HouseholdVO householdVO,IPage<HouseholdVO> page);
 
 	/**
 	 * 查询500M内的民警

--
Gitblit v1.9.3