From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 242936d..8821b4c 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -17,15 +17,17 @@
*/
public interface UserService extends IService<User> {
- Map<String, Object> login(String account, String password);
+ Map<String, Object> login(User user);
- Map<String, Object> addUser(User user, Integer currentUserId);
+ Map<String, Object> addUser(User user, String token);
- Map<String, Object> deleteUser(Integer userId, Integer currentUserId);
+ Map<String, Object> deleteUser(int userId, String token);
- Map<String, Object> updateUser(User user, Integer currentUserId);
+ Map<String, Object> updateUser(User user, String token);
- List<User> getUsersByOrgId(Integer currentUserId);
+ Map<String, Object> getUsers(Map<String, Object> parameters);
- User getUserById(Integer userId, Integer currentUserId);
+ User selectUserInfo(Map<String, Object> parameters);
+
+
}
--
Gitblit v1.8.0