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 | 5 ++++-
1 files changed, 4 insertions(+), 1 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 1e55aeb..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,7 +17,7 @@
*/
public interface UserService extends IService<User> {
- Map<String, Object> login(Map<String, Object> parameters);
+ Map<String, Object> login(User user);
Map<String, Object> addUser(User user, String token);
@@ -27,4 +27,7 @@
Map<String, Object> getUsers(Map<String, Object> parameters);
+ User selectUserInfo(Map<String, Object> parameters);
+
+
}
--
Gitblit v1.8.0