From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml
index 1b014a5..9bf0f59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml
@@ -10,6 +10,32 @@
 		<result column="goldCoin" property="goldCoin"	jdbcType="INTEGER" />
 	</resultMap>
 	
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserInfo">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="identifycode" property="openid" jdbcType="VARCHAR" />
+		<result column="login_type" property="loginType" jdbcType="INTEGER" />
+		<result column="wx_open_id" property="wxOpenId" jdbcType="VARCHAR" />
+		<result column="wx_union_id" property="wxUnionId" jdbcType="VARCHAR" />
+		<result column="nick_name" property="nickName" jdbcType="VARCHAR" />
+		<result column="tbName" property="tbName" jdbcType="VARCHAR" />
+		<result column="tbPic" property="tbPic" jdbcType="VARCHAR" />
+		<result column="wxName" property="wxName" jdbcType="VARCHAR" />
+		<result column="wxPic" property="wxPic" jdbcType="VARCHAR" />
+		<result column="portrait" property="portrait" jdbcType="VARCHAR" />
+		<result column="createtime" property="createtime" jdbcType="BIGINT" />
+		<result column="last_logintime" property="lastLoginTime"
+			jdbcType="BIGINT" />
+		<result column="loginip" property="lastLoginIp" jdbcType="VARCHAR" />
+		<result column="type" property="type" jdbcType="INTEGER" />
+		<result column="appid" property="appId" jdbcType="VARCHAR" />
+		<result column="my_hongBao" property="myHongBao" jdbcType="DECIMAL" />
+		<result column="pay_password" property="payPassword" jdbcType="VARCHAR" />
+		<result column="rank" property="rank" jdbcType="INTEGER" />
+		<result column="phone" property="phone" jdbcType="VARCHAR" />
+		<result column="state" property="state" jdbcType="INTEGER" />
+		<result column="state_desc" property="stateDesc" jdbcType="VARCHAR" />
+	</resultMap>
+	
 	
 	<select id="listByUserGoldCoin" resultMap="UserGoldCoinMapVO">
 		SELECT IFNULL(SUM(d.`td_money`),0) AS goldCoin,u.`id`,u.`nick_name`,u.`portrait`

--
Gitblit v1.8.0