From 0fbe4163e855c1537d6f0040b12fa1501a499de0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 11 六月 2019 09:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 a20c7af..f9c1268 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
@@ -10,6 +10,7 @@
<result column="uie_invite_code" property="inviteCode" jdbcType="VARCHAR"/>
<result column="uie_lottery_newbies" property="lotteryNewbies" jdbcType="INTEGER"/>
<result column="uie_coupon_news" property="couponNews" jdbcType="INTEGER"/>
+ <result column="uie_synch_navbar" property="synchNavbar" jdbcType="VARCHAR"/>
<result column="uie_first_login_time" property="firstLoginTime" jdbcType="TIMESTAMP"/>
<result column="uie_create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="uie_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
@@ -31,6 +32,7 @@
<result column="uie_invite_code" property="inviteCode" jdbcType="VARCHAR"/>
<result column="uie_lottery_newbies" property="lotteryNewbies" jdbcType="INTEGER"/>
<result column="uie_coupon_news" property="couponNews" jdbcType="INTEGER"/>
+ <result column="uie_synch_navbar" property="synchNavbar" jdbcType="VARCHAR"/>
<result column="uie_first_login_time" property="firstLoginTime" jdbcType="TIMESTAMP"/>
<result column="uie_create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="uie_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
@@ -43,7 +45,7 @@
</resultMap>
- <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_first_login_time,uie_create_time,uie_update_time</sql>
+ <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_create_time,uie_update_time</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
<include refid="Base_Column_List"/>from yeshi_ec_user_info_extra where uie_id = #{id,jdbcType=BIGINT}
@@ -51,7 +53,7 @@
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_info_extra where uie_id = #{id,jdbcType=BIGINT}</delete>
- <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_first_login_time,uie_create_time,uie_update_time) 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},#{firstLoginTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+ <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_create_time,uie_update_time) 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},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_info_extra
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -64,6 +66,7 @@
<if test="inviteCode != null">uie_invite_code,</if>
<if test="lotteryNewbies != null">uie_lottery_newbies,</if>
<if test="couponNews != null">uie_coupon_news,</if>
+ <if test="synchNavbar != null">uie_synch_navbar,</if>
<if test="firstLoginTime != null">uie_first_login_time,</if>
<if test="createTime != null">uie_create_time,</if>
<if test="updateTime != null">uie_update_time,</if>
@@ -78,12 +81,13 @@
<if test="inviteCode != null">#{inviteCode,jdbcType=VARCHAR},</if>
<if test="lotteryNewbies != null">#{lotteryNewbies,jdbcType=INTEGER},</if>
<if test="couponNews != null">#{couponNews,jdbcType=INTEGER},</if>
+ <if test="synchNavbar != null">#{synchNavbar,jdbcType=VARCHAR},</if>
<if test="firstLoginTime != null">#{firstLoginTime,jdbcType=TIMESTAMP},</if>
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
</trim>
</insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">update yeshi_ec_user_info_extra set uie_uid = #{userInfo.id,jdbcType=BIGINT},uie_rank_id = #{userRank.id,jdbcType=BIGINT},uie_rank_source = #{rankSource,jdbcType=INTEGER},uie_rank_order_num = #{rankOrderNum,jdbcType=INTEGER},uie_rank_update_time = #{rankUpdateTime,jdbcType=TIMESTAMP},uie_invite_code = #{inviteCode,jdbcType=VARCHAR},uie_lottery_newbies = #{lotteryNewbies,jdbcType=INTEGER},uie_coupon_news = #{couponNews,jdbcType=INTEGER},uie_first_login_time = #{firstLoginTime,jdbcType=TIMESTAMP},uie_create_time = #{createTime,jdbcType=TIMESTAMP},uie_update_time = #{updateTime,jdbcType=TIMESTAMP} where uie_id = #{id,jdbcType=BIGINT}</update>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">update yeshi_ec_user_info_extra set uie_uid = #{userInfo.id,jdbcType=BIGINT},uie_rank_id = #{userRank.id,jdbcType=BIGINT},uie_rank_source = #{rankSource,jdbcType=INTEGER},uie_rank_order_num = #{rankOrderNum,jdbcType=INTEGER},uie_rank_update_time = #{rankUpdateTime,jdbcType=TIMESTAMP},uie_invite_code = #{inviteCode,jdbcType=VARCHAR},uie_lottery_newbies = #{lotteryNewbies,jdbcType=INTEGER},uie_coupon_news = #{couponNews,jdbcType=INTEGER},uie_synch_navbar = #{synchNavbar,jdbcType=VARCHAR},uie_first_login_time = #{firstLoginTime,jdbcType=TIMESTAMP},uie_create_time = #{createTime,jdbcType=TIMESTAMP},uie_update_time = #{updateTime,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
<set>
<if test="userInfo != null">uie_uid=#{userInfo.id,jdbcType=BIGINT},</if>
@@ -94,6 +98,7 @@
<if test="inviteCode != null">uie_invite_code=#{inviteCode,jdbcType=VARCHAR},</if>
<if test="lotteryNewbies != null">uie_lottery_newbies=#{lotteryNewbies,jdbcType=INTEGER},</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="createTime != null">uie_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
@@ -109,6 +114,7 @@
<if test="inviteCode != null">uie_invite_code=#{inviteCode,jdbcType=VARCHAR},</if>
<if test="lotteryNewbies != null">uie_lottery_newbies=#{lotteryNewbies,jdbcType=INTEGER},</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="createTime != null">uie_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<if test="firstLoginTime != null">uie_first_login_time=#{firstLoginTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
--
Gitblit v1.8.0