From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 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 5c34d28..2602977 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
@@ -29,6 +29,7 @@
<result column="uie_gold_coin" property="goldCoin" jdbcType="INTEGER" />
<result column="uie_auto_extract" property="autoExtract"
jdbcType="BOOLEAN" />
+ <result column="uie_close_time_extract" property="closeTimeExtract" jdbcType="TIMESTAMP" />
<association property="userInfo" column="uie_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
@@ -68,6 +69,9 @@
<result column="uie_gold_coin" property="goldCoin" jdbcType="INTEGER" />
<result column="uie_auto_extract" property="autoExtract"
jdbcType="BOOLEAN" />
+
+ <result column="uie_close_time_extract" property="closeTimeExtract" jdbcType="TIMESTAMP" />
+
<association property="userInfo" column="uie_uid"
resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
@@ -103,6 +107,9 @@
<result column="uie_gold_coin" property="goldCoin" jdbcType="INTEGER" />
<result column="uie_auto_extract" property="autoExtract"
jdbcType="BOOLEAN" />
+
+ <result column="uie_close_time_extract" property="closeTimeExtract" jdbcType="TIMESTAMP" />
+
<association property="userInfo" column="uie_uid"
javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
<id column="uie_uid" property="id" jdbcType="BIGINT" />
@@ -114,7 +121,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
+ <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>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
@@ -130,9 +137,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_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)
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})
+ (#{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})
</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra"
@@ -156,6 +163,7 @@
<if test="createTime != null">uie_create_time,</if>
<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>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -176,6 +184,7 @@
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="autoExtract != null">#{autoExtract,jdbcType=BOOLEAN},</if>
+ <if test="closeTimeExtract != null">#{closeTimeExtract,jdbcType=TIMESTAMP},</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">update
@@ -195,7 +204,8 @@
#{goldCoin,jdbcType=INTEGER},uie_create_time =
#{createTime,jdbcType=TIMESTAMP},uie_update_time =
#{updateTime,jdbcType=TIMESTAMP},uie_auto_extract =
- #{autoExtract,jdbcType=BOOLEAN} where uie_id = #{id,jdbcType=BIGINT}
+ #{autoExtract,jdbcType=BOOLEAN},uie_close_time_extract =
+ #{closeTimeExtract,jdbcType=TIMESTAMP} where uie_id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">
update yeshi_ec_user_info_extra
@@ -211,14 +221,14 @@
</if>
<if test="couponNews != null">uie_coupon_news=#{couponNews,jdbcType=INTEGER},</if>
<if test="synchNavbar != null">uie_synch_navbar=#{synchNavbar,jdbcType=VARCHAR},</if>
- <if test="firstLoginTime != null">uie_first_login_time=#{firstLoginTime,jdbcType=TIMESTAMP},
- </if>
+ <if test="firstLoginTime != null">uie_first_login_time=#{firstLoginTime,jdbcType=TIMESTAMP},</if>
<if test="sex != null">uie_sex=#{sex,jdbcType=INTEGER},</if>
<if test="weiXin != null">uie_weixin=#{weiXin,jdbcType=VARCHAR},</if>
<if test="goldCoin != null">uie_gold_coin=#{goldCoin,jdbcType=INTEGER},</if>
<if test="createTime != null">uie_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<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>
</set>
where uie_id = #{id,jdbcType=BIGINT}
</update>
@@ -243,6 +253,7 @@
<if test="createTime != null">uie_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<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>
</set>
where uie_uid = #{userInfo.id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0