From 2ba1e026deb6772ddf6bf28093fc3b6d194b32eb Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 10 Apr 2020 15:25:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java
index 8d9b84b..28c445c 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java
@@ -3,7 +3,9 @@
 import com.kidgrow.common.model.*;
 import com.kidgrow.common.service.ISuperService;
 import com.kidgrow.usercenter.model.SysUserExcel;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,4 +107,8 @@
 	 * 删除用户
 	 */
 	boolean delUser(Long id);
+
+	ResultBody findAll(Map<String, Object> map);
+
+	ResultBody getThisUserOrganizationUser(HttpServletRequest request);
 }

--
Gitblit v1.8.0