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/mapper/UserMapper.java |    6 ++++++
 1 files changed, 6 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..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,5 +1,8 @@
 package com.moral.api.mapper;
 
+import java.util.List;
+import java.util.Map;
+
 import com.moral.api.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -13,4 +16,7 @@
  */
 public interface UserMapper extends BaseMapper<User> {
 
+    List<Map<String, Object>> selectUsers(Map<String, Object> parameters);
+
+    User selectUserInfo(Map<String, Object> parameters);
 }

--
Gitblit v1.8.0