From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
index ab62b3d..035e8c7 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
@@ -51,6 +51,7 @@
id as id,
registIp as registIp,
registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
phone as phone,
nickName as nickName,
avatar as avatar,
@@ -87,6 +88,7 @@
id as id,
registIp as registIp,
registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
phone as phone,
nickName as nickName,
avatar as avatar,
@@ -124,6 +126,7 @@
id as id,
registIp as registIp,
registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
phone as phone,
nickName as nickName,
avatar as avatar,
@@ -163,6 +166,7 @@
id as id,
registIp as registIp,
registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
phone as phone,
nickName as nickName,
avatar as avatar,
@@ -200,6 +204,7 @@
<select id="queryUserInfo" resultType="map">
select
a.id as id,
+ a.phoneOperator as phoneOperator,
a.phone as phone,
a.email as email,
a.lastName as lastName,
@@ -246,6 +251,7 @@
<select id="queryMyInviteUserList" resultType="map">
select
id as id,
+ phoneOperator as phoneOperator,
phone as phone,
IFNULL(lastName,nickName) as name,
avatar as avatar,
--
Gitblit v1.7.1