From 333065f8d9b599b048668a0686ba2ee58944b0e4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 11:26:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/mapper/UserMapper.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java b/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
index db186d8..87be9a9 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
@@ -1,9 +1,8 @@
package com.moral.api.mapper;
-import java.util.Set;
+import java.util.List;
+import java.util.Map;
-import com.moral.api.entity.Group;
-import com.moral.api.entity.Menu;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,7 +16,7 @@
*/
public interface UserMapper extends BaseMapper<User> {
- Set<Group> selectUserGroup(int userId);
+ List<Map<String, Object>> selectUsers(Map<String, Object> parameters);
- Set<Menu> selectUserMenu(int userId);
+ User selectUserInfo(Map<String, Object> parameters);
}
--
Gitblit v1.8.0