From 143160118ab3937ae9e340f61aafa764756856c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 17 十月 2019 14:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
index 2602977..ebca767 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
@@ -30,7 +30,7 @@
<result column="uie_auto_extract" property="autoExtract"
jdbcType="BOOLEAN" />
<result column="uie_close_time_extract" property="closeTimeExtract" jdbcType="TIMESTAMP" />
-
+ <result column="uie_mark" property="mark" jdbcType="VARCHAR" />
<association property="userInfo" column="uie_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
<id column="uie_uid" property="id" jdbcType="BIGINT" />
@@ -71,7 +71,7 @@
jdbcType="BOOLEAN" />
<result column="uie_close_time_extract" property="closeTimeExtract" jdbcType="TIMESTAMP" />
-
+ <result column="uie_mark" property="mark" jdbcType="VARCHAR" />
<association property="userInfo" column="uie_uid"
resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
@@ -109,6 +109,7 @@
jdbcType="BOOLEAN" />
<result column="uie_close_time_extract" property="closeTimeExtract" jdbcType="TIMESTAMP" />
+ <result column="uie_mark" property="mark" jdbcType="VARCHAR" />
<association property="userInfo" column="uie_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
@@ -121,7 +122,7 @@
- <sql id="Base_Column_List">uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract
+ <sql id="Base_Column_List">uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract,uie_mark
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
@@ -137,9 +138,9 @@
<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra"
useGeneratedKeys="true" keyProperty="id">insert into
yeshi_ec_user_info_extra
- (uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract)
+ (uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract,uie_mark)
values
- (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{userRank.id,jdbcType=BIGINT},#{rankSource,jdbcType=INTEGER},#{rankOrderNum,jdbcType=INTEGER},#{rankUpdateTime,jdbcType=TIMESTAMP},#{inviteCode,jdbcType=VARCHAR},#{lotteryNewbies,jdbcType=INTEGER},#{couponNews,jdbcType=INTEGER},#{synchNavbar,jdbcType=VARCHAR},#{firstLoginTime,jdbcType=TIMESTAMP},#{sex,jdbcType=INTEGER},#{weiXin,jdbcType=VARCHAR},#{goldCoin,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{autoExtract,jdbcType=BOOLEAN},#{closeTimeExtract,jdbcType=TIMESTAMP})
+ (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{userRank.id,jdbcType=BIGINT},#{rankSource,jdbcType=INTEGER},#{rankOrderNum,jdbcType=INTEGER},#{rankUpdateTime,jdbcType=TIMESTAMP},#{inviteCode,jdbcType=VARCHAR},#{lotteryNewbies,jdbcType=INTEGER},#{couponNews,jdbcType=INTEGER},#{synchNavbar,jdbcType=VARCHAR},#{firstLoginTime,jdbcType=TIMESTAMP},#{sex,jdbcType=INTEGER},#{weiXin,jdbcType=VARCHAR},#{goldCoin,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{autoExtract,jdbcType=BOOLEAN},#{closeTimeExtract,jdbcType=TIMESTAMP},#{mark,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra"
@@ -164,6 +165,7 @@
<if test="updateTime != null">uie_update_time,</if>
<if test="autoExtract != null">uie_auto_extract,</if>
<if test="closeTimeExtract != null">uie_close_time_extract,</if>
+ <if test="mark != null">uie_mark,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -185,6 +187,7 @@
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="autoExtract != null">#{autoExtract,jdbcType=BOOLEAN},</if>
<if test="closeTimeExtract != null">#{closeTimeExtract,jdbcType=TIMESTAMP},</if>
+ <if test="mark != null">#{mark,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">update
@@ -205,7 +208,8 @@
#{createTime,jdbcType=TIMESTAMP},uie_update_time =
#{updateTime,jdbcType=TIMESTAMP},uie_auto_extract =
#{autoExtract,jdbcType=BOOLEAN},uie_close_time_extract =
- #{closeTimeExtract,jdbcType=TIMESTAMP} where uie_id = #{id,jdbcType=BIGINT}
+ #{closeTimeExtract,jdbcType=TIMESTAMP},uie_mark =
+ #{mark,jdbcType=VARCHAR} where uie_id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">
update yeshi_ec_user_info_extra
@@ -229,6 +233,7 @@
<if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="autoExtract != null">uie_auto_extract=#{autoExtract,jdbcType=BOOLEAN},</if>
<if test="closeTimeExtract != null">uie_close_time_extract=#{closeTimeExtract,jdbcType=TIMESTAMP},</if>
+ <if test="mark != null">uie_mark=#{mark,jdbcType=VARCHAR},</if>
</set>
where uie_id = #{id,jdbcType=BIGINT}
</update>
@@ -254,6 +259,7 @@
<if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="autoExtract != null">uie_auto_extract=#{autoExtract,jdbcType=BOOLEAN},</if>
<if test="closeTimeExtract != null">uie_close_time_extract=#{closeTimeExtract,jdbcType=TIMESTAMP},</if>
+ <if test="mark != null">uie_mark=#{mark,jdbcType=VARCHAR},</if>
</set>
where uie_uid = #{userInfo.id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0