From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/service/UserService.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/UserService.java b/screen-manage/src/main/java/com/moral/api/service/UserService.java
index 9e2d2ea..a453dd8 100644
--- a/screen-manage/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/UserService.java
@@ -19,12 +19,40 @@
  */
 public interface UserService extends IService<User> {
 
+    /**
+    * @Description: ���������������������admin������
+            * @Param: [form]
+            * @return: com.moral.api.pojo.dto.user.UserQueryDTO
+            * @Author: ���������
+            * @Date: 2021/5/20
+            */
     UserQueryDTO queryUsers(UserQueryForm form);
 
+    /**
+    * @Description: ���������������admin������
+            * @Param: [form]
+            * @return: com.moral.api.pojo.dto.user.UserDTO
+            * @Author: ���������
+            * @Date: 2021/5/20
+            */
     UserDTO updateUser(UserUpdateForm form);
 
-    UserDTO deleteUser(UserDeleteForm form);
-
+    /**
+    * @Description: ���������������admin������
+            * @Param: [form]
+            * @return: com.moral.api.pojo.dto.user.UserDTO
+            * @Author: ���������
+            * @Date: 2021/5/20
+            */
     UserDTO insertUser(UserInsertForm form);
 
+    /**
+    * @Description: ������������������������������������������������������������
+            * @Param: [organizationId]
+            * @return: com.moral.api.pojo.dto.user.UserDTO
+            * @Author: ���������
+            * @Date: 2021/5/20
+            */
+    UserDTO deleteUsersByOrganizationId(Integer organizationId);
+
 }

--
Gitblit v1.8.0