From 535296ad8d0482856e98f788c667f3fa72576637 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 10 Mar 2021 17:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/java/com/moral/api/mapper/UserMapper.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 16631cf..db186d8 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,5 +1,9 @@
 package com.moral.api.mapper;
 
+import java.util.Set;
+
+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;
 
@@ -13,4 +17,7 @@
  */
 public interface UserMapper extends BaseMapper<User> {
 
+    Set<Group> selectUserGroup(int userId);
+
+    Set<Menu> selectUserMenu(int userId);
 }

--
Gitblit v1.8.0