From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 4ca4de2..4b11228 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
@@ -7,7 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.UserBo;
+
+import com.moral.api.pojo.bo.UserBO;
/**
* <p>
@@ -19,16 +20,28 @@
*/
public interface UserService extends IService<User> {
+ //������
Map<String, Object> login(Map<String, Object> parameters);
- Map<String, Object> addUser(User user, String token);
+ //������������������������
+ Map<String,Object> getCurrentUserInfo();
- void deleteUser(User user);
+ //������������
+ Map<String, Object> getMenus(Map<String, Object> parameters);
- Map<String, Object> updateUser(User user, String token);
+ //������������
+ Map<String, Object> addUser(User user);
+ //������������
+ void deleteUser(Integer userId);
+
+ //������������
+ Map<String, Object> updateUser(User user);
+
+ //������������������
Page<User> selectUsers(Map<String, Object> parameters);
- UserBo selectUserInfo(Map<String, Object> parameters);
+ //������������������������������������
+ UserBO selectUserInfo(Map<String, Object> parameters);
}
--
Gitblit v1.8.0