From 2297c50a14f92dd869edae212d4aabe8f0bf0572 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 25 Apr 2021 21:21:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
index 14b54e1..7915751 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -77,10 +77,10 @@
 	 * @param page
 	 * @param user
 	 * @param deptId
-	 * @param tenantId
+	 * @param
 	 * @return
 	 */
-	IPage<User> selectUserPages(IPage<User> page, User user, Long deptId, String tenantId);
+	IPage<User> selectUserPages(IPage<User> page, User user, Long deptId);
 
 	/**
 	 * 用户信息

--
Gitblit v1.9.3