From 82841afc4e140f72fdeb378102e0e9a978bbe14c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 10:26:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/mapper/UserMapper.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 4c42c13..3798fc1 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,11 +1,10 @@
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;
-import com.moral.api.pojo.UserBo;
+import com.moral.api.pojo.bo.UserBO;
/**
* <p>
@@ -17,9 +16,6 @@
*/
public interface UserMapper extends BaseMapper<User> {
- List<Map<String, Object>> selectUsers(Map<String, Object> parameters);
+ UserBO selectUserInfo(Map<String, Object> parameters);
- UserBo selectUserInfo(Map<String, Object> parameters);
-
- User selectUser(Map<String, Object> parameters);
}
--
Gitblit v1.8.0