From 5e23b5966d393f1eb94bca82498e09a67274e321 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 15 Mar 2021 08:24:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 11 +++++------
1 files changed, 5 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 a514410..1e55aeb 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,14 @@
*/
public interface UserService extends IService<User> {
- Map<String, Object> login(Map<String,Object> parameters);
+ Map<String, Object> login(Map<String, Object> parameters);
- 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);
}
--
Gitblit v1.8.0