From 4e94fa3ebf98bb8a9a6eda39a7324461fc4ebb40 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 27 二月 2021 18:08:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 6 ++++--
1 files changed, 4 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..7973cc3 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,10 +1,12 @@
<?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,
+ u.certificateNumb,
+ u.nickName,
u.email,
u.mobile,
u.status,
@@ -52,7 +54,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