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/SMSHistoryMapper.xml |  124 ++++++++++++++++++++--------------------
 1 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/SMSHistoryMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/SMSHistoryMapper.xml
index 4db4a16..c2a71dc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/SMSHistoryMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/SMSHistoryMapper.xml
@@ -1,62 +1,62 @@
-<?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.SMSHistoryMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.SMSHistory">
-		<id column="sh_id" property="id" jdbcType="BIGINT" />
-		<result column="sh_type" property="type" jdbcType="INTEGER" />
-		<result column="sh_phone" property="phone" jdbcType="VARCHAR" />
-		<result column="sh_content" property="content" jdbcType="VARCHAR" />
-		<result column="sh_createtime" property="createTime" jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">sh_id,sh_type,sh_phone,sh_content,sh_createtime</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_sms_history where sh_id = #{id,jdbcType=BIGINT}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_sms_history where sh_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sms_history
-		(sh_id,sh_type,sh_phone,sh_content,sh_createtime) values
-		(#{id,jdbcType=BIGINT},#{type,jdbcType=INTEGER},#{phone,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_sms_history
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">sh_id,</if>
-			<if test="type != null">sh_type,</if>
-			<if test="phone != null">sh_phone,</if>
-			<if test="content != null">sh_content,</if>
-			<if test="createTime != null">sh_createtime,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="type != null">#{type,jdbcType=INTEGER},</if>
-			<if test="phone != null">#{phone,jdbcType=VARCHAR},</if>
-			<if test="content != null">#{content,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory">update
-		yeshi_ec_sms_history set sh_type = #{type,jdbcType=INTEGER},sh_phone =
-		#{phone,jdbcType=VARCHAR},sh_content =
-		#{content,jdbcType=VARCHAR},sh_createtime =
-		#{createTime,jdbcType=TIMESTAMP} where sh_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory">
-		update yeshi_ec_sms_history
-		<set>
-			<if test="type != null">sh_type=#{type,jdbcType=INTEGER},</if>
-			<if test="phone != null">sh_phone=#{phone,jdbcType=VARCHAR},</if>
-			<if test="content != null">sh_content=#{content,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">sh_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
-		</set>
-		where sh_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.SMSHistoryMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.SMSHistory">
+		<id column="sh_id" property="id" jdbcType="BIGINT" />
+		<result column="sh_type" property="type" jdbcType="INTEGER" />
+		<result column="sh_phone" property="phone" jdbcType="VARCHAR" />
+		<result column="sh_content" property="content" jdbcType="VARCHAR" />
+		<result column="sh_createtime" property="createTime" jdbcType="TIMESTAMP" />
+	</resultMap>
+	<sql id="Base_Column_List">sh_id,sh_type,sh_phone,sh_content,sh_createtime</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_sms_history where sh_id = #{id,jdbcType=BIGINT}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_sms_history where sh_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_sms_history
+		(sh_id,sh_type,sh_phone,sh_content,sh_createtime) values
+		(#{id,jdbcType=BIGINT},#{type,jdbcType=INTEGER},#{phone,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_sms_history
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">sh_id,</if>
+			<if test="type != null">sh_type,</if>
+			<if test="phone != null">sh_phone,</if>
+			<if test="content != null">sh_content,</if>
+			<if test="createTime != null">sh_createtime,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="type != null">#{type,jdbcType=INTEGER},</if>
+			<if test="phone != null">#{phone,jdbcType=VARCHAR},</if>
+			<if test="content != null">#{content,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory">update
+		yeshi_ec_sms_history set sh_type = #{type,jdbcType=INTEGER},sh_phone =
+		#{phone,jdbcType=VARCHAR},sh_content =
+		#{content,jdbcType=VARCHAR},sh_createtime =
+		#{createTime,jdbcType=TIMESTAMP} where sh_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.SMSHistory">
+		update yeshi_ec_sms_history
+		<set>
+			<if test="type != null">sh_type=#{type,jdbcType=INTEGER},</if>
+			<if test="phone != null">sh_phone=#{phone,jdbcType=VARCHAR},</if>
+			<if test="content != null">sh_content=#{content,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">sh_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
+		</set>
+		where sh_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0