From 179b39401c406579a0d10c442a665aeb2802e931 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml
index 627ce6e..552a31a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsSubClassMapper.xml
@@ -20,10 +20,13 @@
jdbcType="BIGINT" />
<result column="sub_createtime" property="createtime" jdbcType="TIMESTAMP" />
<result column="sub_updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+ <result column="sub_sex" property="sex" jdbcType="INTEGER" />
+ <result column="sub_month" property="month" jdbcType="VARCHAR" />
<association property="rootClass" column="sub_root_id"
select="com.yeshi.fanli.dao.mybatis.GoodsClassMapper.selectByPrimaryKey" />
<association property="parent" column="sub_pid"
select="com.yeshi.fanli.dao.mybatis.GoodsSubClassMapper.selectByPrimaryKey" />
+
</resultMap>
<resultMap id="SimpleResultMap"
type="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass">
@@ -43,6 +46,8 @@
jdbcType="BIGINT" />
<result column="sub_createtime" property="createtime" jdbcType="TIMESTAMP" />
<result column="sub_updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+ <result column="sub_sex" property="sex" jdbcType="INTEGER" />
+ <result column="sub_month" property="month" jdbcType="VARCHAR" />
<association property="rootClass" column="sub_root_id"
javaType="com.yeshi.fanli.entity.bus.clazz.GoodsClass">
<id column="sub_root_id" property="id" jdbcType="BIGINT" />
@@ -52,7 +57,7 @@
<id column="sub_pid" property="id" jdbcType="BIGINT" />
</association>
</resultMap>
- <sql id="Base_Column_List">sub_id,sub_name,sub_picture,sub_picture_second,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime
+ <sql id="Base_Column_List">sub_id,sub_name,sub_picture,sub_picture_second,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime,sub_sex,sub_month
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -61,12 +66,13 @@
from yeshi_ec_sub_class where sub_id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
- yeshi_ec_sub_class where sub_id = #{id,jdbcType=BIGINT}</delete>
+ yeshi_ec_sub_class where sub_id = #{id,jdbcType=BIGINT}
+ </delete>
<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass"
useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sub_class
- (sub_id,sub_name,sub_picture,sub_picture_second,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime)
+ (sub_id,sub_name,sub_picture,sub_picture_second,sub_weight,sub_root_id,sub_pid,sub_level,sub_state,sub_key,sub_search_json,sub_ios_click,sub_android_click,sub_createtime,sub_updatetime,sub_sex,sub_month)
values
- (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{pictureSecond,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{rootClass.id,jdbcType=BIGINT},#{parent.id,jdbcType=BIGINT},#{level,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{key,jdbcType=VARCHAR},#{searchJson,jdbcType=VARCHAR},#{iosClick,jdbcType=BIGINT},#{androidClick,jdbcType=BIGINT},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})
+ (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{pictureSecond,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{rootClass.id,jdbcType=BIGINT},#{parent.id,jdbcType=BIGINT},#{level,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{key,jdbcType=VARCHAR},#{searchJson,jdbcType=VARCHAR},#{iosClick,jdbcType=BIGINT},#{androidClick,jdbcType=BIGINT},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP},#{sex,jdbcType=INTEGER},#{month,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass"
useGeneratedKeys="true" keyProperty="id">
@@ -87,6 +93,8 @@
<if test="androidClick != null">sub_android_click,</if>
<if test="createtime != null">sub_createtime,</if>
<if test="updatetime != null">sub_updatetime,</if>
+ <if test="sex != null">sub_sex,</if>
+ <if test="month != null">sub_month,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -105,6 +113,8 @@
<if test="androidClick != null">#{androidClick,jdbcType=BIGINT},</if>
<if test="createtime != null">#{createtime,jdbcType=TIMESTAMP},</if>
<if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>
+ <if test="sex != null">#{sex,jdbcType=INTEGER},</if>
+ <if test="month != null">#{month,jdbcType=VARCHAR}</if>
</trim>
</insert>
<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass">update
@@ -120,7 +130,9 @@
#{iosClick,jdbcType=BIGINT},sub_android_click =
#{androidClick,jdbcType=BIGINT},sub_createtime =
#{createtime,jdbcType=TIMESTAMP},sub_updatetime =
- #{updatetime,jdbcType=TIMESTAMP} where sub_id = #{id,jdbcType=BIGINT}
+ #{updatetime,jdbcType=TIMESTAMP} ,sub_sex =#{sex,jdbcType=INTEGER}
+ ,sub_month =#{month,jdbcType=VARCHAR} where sub_id =
+ #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsSubClass">
update yeshi_ec_sub_class
@@ -140,6 +152,8 @@
<if test="androidClick != null">sub_android_click=#{androidClick,jdbcType=BIGINT},</if>
<if test="createtime != null">sub_createtime=#{createtime,jdbcType=TIMESTAMP},</if>
<if test="updatetime != null">sub_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>
+ <if test="sex !=null">sub_sex =#{sex,jdbcType=INTEGER},</if>
+ <if test="month !=null">sub_month =#{month,jdbcType=VARCHAR},</if>
</set>
where sub_id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0