From b3ec53a9da0c09dd03da33bfc27f278d13a5d8f9 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 16 二月 2023 19:08:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml index 39c0cf3..b82af71 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml @@ -8,7 +8,7 @@ <result column="avatar" property="avatar" /> <result column="account" property="account" /> <result column="password" property="password" /> - <result column="passWordUpdate" property="passWordUpdate"/> + <result column="pass_word_update" property="passWordUpdate"/> <result column="salt" property="salt" /> <result column="name" property="name" /> <result column="birthday" property="birthday" /> @@ -20,6 +20,8 @@ <result column="status" property="status" /> <result column="createtime" property="createtime" /> <result column="version" property="version" /> + <result column="role_type" property="roleType" /> + <result column="object_id" property="objectId" /> </resultMap> <sql id="Base_Column_List"> -- Gitblit v1.7.1