From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/lable/MergeClassMapper.xml |   94 +++++++++++++++++++++++-----------------------
 1 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/lable/MergeClassMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/lable/MergeClassMapper.xml
index 0f15104..8965b2e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/lable/MergeClassMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/lable/MergeClassMapper.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.yeshi.fanli.dao.mybatis.lable.MergeClassMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.lable.MergeClass">
-    <id column="k_id" property="id" jdbcType="BIGINT"/>
-    <result column="k_name" property="name" jdbcType="VARCHAR"/>
-    <result column="k_merge_cid" property="mergeCids" jdbcType="VARCHAR"/>
-    <result column="k_weight" property="weight" jdbcType="DOUBLE"/>
-    <result column="k_createtime" property="createtime" jdbcType="TIMESTAMP"/>
-    <result column="k_updatetime" property="updatetime" jdbcType="TIMESTAMP"/>
-  </resultMap>
-  <sql id="Base_Column_List">k_id,k_name,k_merge_cid,k_weight,k_createtime,k_updatetime</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_class_9k9 where k_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_class_9k9 where k_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.lable.MergeClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_class_9k9 (k_id,k_name,k_merge_cid,k_weight,k_createtime,k_updatetime) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{mergeCids,jdbcType=VARCHAR},#{weight,jdbcType=DOUBLE},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.lable.MergeClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_class_9k9
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">k_id,</if>
-      <if test="name != null">k_name,</if>
-      <if test="mergeCids != null">k_merge_cid,</if>
-      <if test="weight != null">k_weight,</if>
-      <if test="createtime != null">k_createtime,</if>
-      <if test="updatetime != null">k_updatetime,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="name != null">#{name,jdbcType=VARCHAR},</if>
-      <if test="mergeCids != null">#{mergeCids,jdbcType=VARCHAR},</if>
-      <if test="weight != null">#{weight,jdbcType=DOUBLE},</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.lable.MergeClass">update yeshi_ec_class_9k9 set k_name = #{name,jdbcType=VARCHAR},k_merge_cid = #{mergeCids,jdbcType=VARCHAR},k_weight = #{weight,jdbcType=DOUBLE},k_createtime = #{createtime,jdbcType=TIMESTAMP},k_updatetime = #{updatetime,jdbcType=TIMESTAMP} where k_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.lable.MergeClass">update yeshi_ec_class_9k9
-    <set>
-      <if test="name != null">k_name=#{name,jdbcType=VARCHAR},</if>
-      <if test="mergeCids != null">k_merge_cid=#{mergeCids,jdbcType=VARCHAR},</if>
-      <if test="weight != null">k_weight=#{weight,jdbcType=DOUBLE},</if>
-      <if test="createtime != null">k_createtime=#{createtime,jdbcType=TIMESTAMP},</if>
-      <if test="updatetime != null">k_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>
-    </set> where k_id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yeshi.fanli.dao.mybatis.lable.MergeClassMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.lable.MergeClass">
+    <id column="k_id" property="id" jdbcType="BIGINT"/>
+    <result column="k_name" property="name" jdbcType="VARCHAR"/>
+    <result column="k_merge_cid" property="mergeCids" jdbcType="VARCHAR"/>
+    <result column="k_weight" property="weight" jdbcType="DOUBLE"/>
+    <result column="k_createtime" property="createtime" jdbcType="TIMESTAMP"/>
+    <result column="k_updatetime" property="updatetime" jdbcType="TIMESTAMP"/>
+  </resultMap>
+  <sql id="Base_Column_List">k_id,k_name,k_merge_cid,k_weight,k_createtime,k_updatetime</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_class_9k9 where k_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_class_9k9 where k_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.lable.MergeClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_class_9k9 (k_id,k_name,k_merge_cid,k_weight,k_createtime,k_updatetime) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{mergeCids,jdbcType=VARCHAR},#{weight,jdbcType=DOUBLE},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.lable.MergeClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_class_9k9
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">k_id,</if>
+      <if test="name != null">k_name,</if>
+      <if test="mergeCids != null">k_merge_cid,</if>
+      <if test="weight != null">k_weight,</if>
+      <if test="createtime != null">k_createtime,</if>
+      <if test="updatetime != null">k_updatetime,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="name != null">#{name,jdbcType=VARCHAR},</if>
+      <if test="mergeCids != null">#{mergeCids,jdbcType=VARCHAR},</if>
+      <if test="weight != null">#{weight,jdbcType=DOUBLE},</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.lable.MergeClass">update yeshi_ec_class_9k9 set k_name = #{name,jdbcType=VARCHAR},k_merge_cid = #{mergeCids,jdbcType=VARCHAR},k_weight = #{weight,jdbcType=DOUBLE},k_createtime = #{createtime,jdbcType=TIMESTAMP},k_updatetime = #{updatetime,jdbcType=TIMESTAMP} where k_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.lable.MergeClass">update yeshi_ec_class_9k9
+    <set>
+      <if test="name != null">k_name=#{name,jdbcType=VARCHAR},</if>
+      <if test="mergeCids != null">k_merge_cid=#{mergeCids,jdbcType=VARCHAR},</if>
+      <if test="weight != null">k_weight=#{weight,jdbcType=DOUBLE},</if>
+      <if test="createtime != null">k_createtime=#{createtime,jdbcType=TIMESTAMP},</if>
+      <if test="updatetime != null">k_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>
+    </set> where k_id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

--
Gitblit v1.8.0