From b4f51073e4a5ac0fc14a2087af339cd39e267f0d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 09:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/resources/mapper/UserMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/resources/mapper/UserMapper.xml b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
index e866440..18dd6b5 100644
--- a/cloud-server-management/src/main/resources/mapper/UserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
@@ -8,7 +8,6 @@
<result column="avatar" property="avatar" />
<result column="account" property="account" />
<result column="password" property="password" />
- <result column="passWordUpdate" property="passWordUpdate"/>
<result column="salt" property="salt" />
<result column="name" property="name" />
<result column="birthday" property="birthday" />
@@ -33,7 +32,7 @@
id, account, name, birthday,password, sex, email, avatar,
phone, roleid,salt,
deptid, status,
- createtime, version,roleType,objectId
+ createtime, version
</sql>
<select id="selectUsers" resultType="map">
@@ -69,7 +68,7 @@
#{userId}
</update>
- <select id="getByAccount" resultType="user">
+ <select id="getByAccount" resultType="com.dsh.guns.modular.system.model.User">
select
<include refid="Base_Column_List_With_Pwd" />
from sys_user where account = #{account} and status != 3
--
Gitblit v1.7.1