From 364811c321ca9b3af58f3ec85ca5de0183a5e57b Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 19 六月 2023 17:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java
index 51ace0f..1d38c73 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java
@@ -84,6 +84,15 @@
 	 * 鑷畾涔夊垎椤�
 	 *
 	 * @param user
+	 * @param deptId
+	 * @return
+	 */
+	List<User> selectAllUser(User user, Long deptId);
+
+	/**
+	 * 鑷畾涔夊垎椤�
+	 *
+	 * @param user
 	 * @param query
 	 * @return
 	 */
@@ -107,6 +116,15 @@
 	UserInfo userInfo(String tenantId, String account);
 
 	/**
+	 * 鐢ㄦ埛淇℃伅,涓哄暐涓嶅垹浜嗕笂杈归偅涓柟娉曞憿锛屽洜涓烘垜涓嶆暍,鐗垫壇鏈夌偣澶�
+	 *
+	 * @param tenantId
+	 * @param account
+	 * @return
+	 */
+	UserInfo userInfo(String tenantId, String account,String name);
+
+	/**
 	 * 鐢ㄦ埛淇℃伅
 	 *
 	 * @param tenantId

--
Gitblit v1.9.3