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/order/CommonOrderTradeIdMapMapper.xml |  134 ++++++++++++++++++++++----------------------
 1 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderTradeIdMapMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderTradeIdMapMapper.xml
index 74e2880..b021856 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderTradeIdMapMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderTradeIdMapMapper.xml
@@ -1,67 +1,67 @@
-<?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.order.CommonOrderTradeIdMapMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap">
-		<id column="id" property="id" jdbcType="BIGINT" />
-		<result column="common_order_id" property="commonOrderId"
-			jdbcType="BIGINT" />
-		<result column="trade_id" property="tradeId" jdbcType="VARCHAR" />
-		<result column="source_type" property="sourceType" jdbcType="INTEGER" />
-		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">id,common_order_id,trade_id,source_type,create_time</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_common_order_tradeid_map where id =
-		#{id,jdbcType=BIGINT}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_common_order_tradeid_map where id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_common_order_tradeid_map
-		(id,common_order_id,trade_id,create_time,source_type) values
-		(#{id,jdbcType=BIGINT},#{commonOrderId,jdbcType=BIGINT},#{tradeId,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{sourceType,jdbcType=INTEGER})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_common_order_tradeid_map
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">id,</if>
-			<if test="commonOrderId != null">common_order_id,</if>
-			<if test="tradeId != null">trade_id,</if>
-			<if test="createTime != null">create_time,</if>
-			<if test="sourceType != null">source_type,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="commonOrderId != null">#{commonOrderId,jdbcType=BIGINT},</if>
-			<if test="tradeId != null">#{tradeId,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="sourceType != null">#{sourceType,jdbcType=INTEGER},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap">update
-		yeshi_ec_common_order_tradeid_map set common_order_id =
-		#{commonOrderId,jdbcType=BIGINT},trade_id =
-		#{tradeId,jdbcType=VARCHAR},create_time =
-		#{createTime,jdbcType=TIMESTAMP},source_type =
-		#{sourceType,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap">
-		update yeshi_ec_common_order_tradeid_map
-		<set>
-			<if test="commonOrderId != null">common_order_id=#{commonOrderId,jdbcType=BIGINT},</if>
-			<if test="tradeId != null">trade_id=#{tradeId,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="sourceType != null">source_type=#{sourceType,jdbcType=INTEGER},</if>
-		</set>
-		where 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.order.CommonOrderTradeIdMapMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="common_order_id" property="commonOrderId"
+			jdbcType="BIGINT" />
+		<result column="trade_id" property="tradeId" jdbcType="VARCHAR" />
+		<result column="source_type" property="sourceType" jdbcType="INTEGER" />
+		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+	</resultMap>
+	<sql id="Base_Column_List">id,common_order_id,trade_id,source_type,create_time</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_common_order_tradeid_map where id =
+		#{id,jdbcType=BIGINT}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_common_order_tradeid_map where id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_common_order_tradeid_map
+		(id,common_order_id,trade_id,create_time,source_type) values
+		(#{id,jdbcType=BIGINT},#{commonOrderId,jdbcType=BIGINT},#{tradeId,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{sourceType,jdbcType=INTEGER})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_common_order_tradeid_map
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="commonOrderId != null">common_order_id,</if>
+			<if test="tradeId != null">trade_id,</if>
+			<if test="createTime != null">create_time,</if>
+			<if test="sourceType != null">source_type,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="commonOrderId != null">#{commonOrderId,jdbcType=BIGINT},</if>
+			<if test="tradeId != null">#{tradeId,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="sourceType != null">#{sourceType,jdbcType=INTEGER},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap">update
+		yeshi_ec_common_order_tradeid_map set common_order_id =
+		#{commonOrderId,jdbcType=BIGINT},trade_id =
+		#{tradeId,jdbcType=VARCHAR},create_time =
+		#{createTime,jdbcType=TIMESTAMP},source_type =
+		#{sourceType,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.CommonOrderTradeIdMap">
+		update yeshi_ec_common_order_tradeid_map
+		<set>
+			<if test="commonOrderId != null">common_order_id=#{commonOrderId,jdbcType=BIGINT},</if>
+			<if test="tradeId != null">trade_id=#{tradeId,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="sourceType != null">source_type=#{sourceType,jdbcType=INTEGER},</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0