From 2b71869efe32d2b8f0bc9351bec4d0b0ed8efcf0 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 二月 2021 07:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
index 9e0e51e..f8589a9 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.system.mapper.UserMapper">
- <select id="findUserDetailPage" parameterType="systemUser" resultType="systemUser">
+ <select id="findUserDetailPage" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
SELECT
u.user_id userId,
u.username,
@@ -52,7 +52,7 @@
u.dept_id,u.last_login_time,u.modify_time,u.description,u.avatar
</select>
- <select id="findUserDetail" parameterType="systemUser" resultType="systemUser">
+ <select id="findUserDetail" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
SELECT
u.user_id userId,
u.username,
--
Gitblit v1.8.0