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/mapper/UserMapper.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 87be9a9..4c42c13 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
@@ -5,6 +5,7 @@
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.pojo.UserBo;
/**
* <p>
@@ -18,5 +19,7 @@
List<Map<String, Object>> selectUsers(Map<String, Object> parameters);
- User selectUserInfo(Map<String, Object> parameters);
+ UserBo selectUserInfo(Map<String, Object> parameters);
+
+ User selectUser(Map<String, Object> parameters);
}
--
Gitblit v1.8.0