From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
index d11b3a9..fb87d19 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
@@ -16,7 +16,8 @@
<result column="emergencyContact" property="emergencyContact" />
<result column="emergencyContactNumber" property="emergencyContactNumber" />
<result column="isAuth" property="isAuth" />
- <result column="name" property="name" />
+ <result column="lastName" property="lastName" />
+ <result column="firstName" property="firstName" />
<result column="idCard" property="idCard" />
<result column="idCardFront" property="idCardFront" />
<result column="idCardReverse" property="idCardReverse" />
@@ -34,11 +35,12 @@
<result column="updateTime" property="updateTime" />
<result column="updateUser" property="updateUser" />
<result column="uid" property="uid"/>
+ <result column="email" property="email"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, companyId, registIp, registAreaCode, phone, nickName, avatar, birthday, sex, emergencyContact, emergencyContactNumber, isAuth, name, idCard, idCardFront, idCardReverse, consumption, balance, integral, passWord, openId, unionid, remark, state, flag, insertTime, insertUser, updateTime, updateUser,uid
+ id, companyId, registIp, registAreaCode,email, phone, nickName, avatar, birthday, sex, emergencyContact, emergencyContactNumber, isAuth, name, idCard, idCardFront, idCardReverse, consumption, balance, integral, passWord, openId, unionid, remark, state, flag, insertTime, insertUser, updateTime, updateUser,uid
</sql>
<!--根据条件查询用户列表-->
--
Gitblit v1.7.1