From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 15 +++++++++------
1 files changed, 9 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 8821b4c..2af3654 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
@@ -1,11 +1,13 @@
package com.moral.api.service;
-import java.util.List;
import java.util.Map;
+
+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;
/**
* <p>
@@ -17,17 +19,18 @@
*/
public interface UserService extends IService<User> {
- Map<String, Object> login(User user);
+ Map<String, Object> login(Map<String, Object> parameters);
+
+ Map<String, Object> getMenus(Map<String, Object> parameters);
Map<String, Object> addUser(User user, String token);
- Map<String, Object> deleteUser(int userId, String token);
+ void deleteUser(User user);
Map<String, Object> updateUser(User user, String token);
- Map<String, Object> getUsers(Map<String, Object> parameters);
+ Page<User> selectUsers(Map<String, Object> parameters);
- User selectUserInfo(Map<String, Object> parameters);
-
+ UserBo selectUserInfo(Map<String, Object> parameters);
}
--
Gitblit v1.8.0