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/user/UserInfoModifyRecordMapper.xml |  168 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoModifyRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoModifyRecordMapper.xml
index 12d8d4c..c8c341d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoModifyRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoModifyRecordMapper.xml
@@ -1,84 +1,84 @@
-<?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.user.UserInfoModifyRecordMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">
-		<id column="umr_id" property="id" jdbcType="BIGINT" />
-		<result column="umr_uid" property="uid" jdbcType="BIGINT" />
-		<result column="umr_type" property="type" jdbcType="VARCHAR" />
-		<result column="umr_value" property="value" jdbcType="VARCHAR" />
-		<result column="umr_create_time" property="createTime"
-			jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">umr_id,umr_uid,umr_type,umr_value,umr_create_time</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_user_modify_record where umr_id = #{id,jdbcType=BIGINT}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_user_modify_record where umr_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert"
-		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_user_modify_record
-		(umr_id,umr_uid,umr_type,umr_value,umr_create_time) values
-		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective"
-		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_user_modify_record
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">umr_id,</if>
-			<if test="uid != null">umr_uid,</if>
-			<if test="type != null">umr_type,</if>
-			<if test="value != null">umr_value,</if>
-			<if test="createTime != null">umr_create_time,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="uid != null">#{uid,jdbcType=BIGINT},</if>
-			<if test="type != null">#{type,jdbcType=VARCHAR},</if>
-			<if test="value != null">#{value,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey"
-		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">update yeshi_ec_user_modify_record set umr_uid =
-		#{uid,jdbcType=BIGINT},umr_type = #{type,jdbcType=VARCHAR},umr_value =
-		#{value,jdbcType=VARCHAR},umr_create_time =
-		#{createTime,jdbcType=TIMESTAMP} where umr_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective"
-		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">
-		update yeshi_ec_user_modify_record
-		<set>
-			<if test="uid != null">umr_uid=#{uid,jdbcType=BIGINT},</if>
-			<if test="type != null">umr_type=#{type,jdbcType=VARCHAR},</if>
-			<if test="value != null">umr_value=#{value,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">umr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-		</set>
-		where umr_id = #{id,jdbcType=BIGINT}
-	</update>
-
-	<select id="countByUid" resultType="Long">
-		SELECT IFNULL(COUNT(d.`umr_id`),0) FROM yeshi_ec_user_modify_record d
-		WHERE d.`umr_uid` = #{uid}
-		<if test="type != null">AND d.`umr_type`= #{type}</if>
-	</select>
-
-
-	<select id="selectLatestByUidAndType" resultMap="BaseResultMap">
-		SELECT * FROM yeshi_ec_user_modify_record d
-		WHERE d.`umr_uid` = #{uid}
-		<if test="type != null">AND d.`umr_type`= #{type}</if>
-		order by umr_id desc
-		limit 1
-	</select>
-
-</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.user.UserInfoModifyRecordMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">
+		<id column="umr_id" property="id" jdbcType="BIGINT" />
+		<result column="umr_uid" property="uid" jdbcType="BIGINT" />
+		<result column="umr_type" property="type" jdbcType="VARCHAR" />
+		<result column="umr_value" property="value" jdbcType="VARCHAR" />
+		<result column="umr_create_time" property="createTime"
+			jdbcType="TIMESTAMP" />
+	</resultMap>
+	<sql id="Base_Column_List">umr_id,umr_uid,umr_type,umr_value,umr_create_time</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_user_modify_record where umr_id = #{id,jdbcType=BIGINT}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_user_modify_record where umr_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert"
+		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_user_modify_record
+		(umr_id,umr_uid,umr_type,umr_value,umr_create_time) values
+		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
+	</insert>
+	<insert id="insertSelective"
+		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_user_modify_record
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">umr_id,</if>
+			<if test="uid != null">umr_uid,</if>
+			<if test="type != null">umr_type,</if>
+			<if test="value != null">umr_value,</if>
+			<if test="createTime != null">umr_create_time,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="uid != null">#{uid,jdbcType=BIGINT},</if>
+			<if test="type != null">#{type,jdbcType=VARCHAR},</if>
+			<if test="value != null">#{value,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey"
+		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">update yeshi_ec_user_modify_record set umr_uid =
+		#{uid,jdbcType=BIGINT},umr_type = #{type,jdbcType=VARCHAR},umr_value =
+		#{value,jdbcType=VARCHAR},umr_create_time =
+		#{createTime,jdbcType=TIMESTAMP} where umr_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective"
+		parameterType="com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord">
+		update yeshi_ec_user_modify_record
+		<set>
+			<if test="uid != null">umr_uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="type != null">umr_type=#{type,jdbcType=VARCHAR},</if>
+			<if test="value != null">umr_value=#{value,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">umr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+		</set>
+		where umr_id = #{id,jdbcType=BIGINT}
+	</update>
+
+	<select id="countByUid" resultType="Long">
+		SELECT IFNULL(COUNT(d.`umr_id`),0) FROM yeshi_ec_user_modify_record d
+		WHERE d.`umr_uid` = #{uid}
+		<if test="type != null">AND d.`umr_type`= #{type}</if>
+	</select>
+
+
+	<select id="selectLatestByUidAndType" resultMap="BaseResultMap">
+		SELECT * FROM yeshi_ec_user_modify_record d
+		WHERE d.`umr_uid` = #{uid}
+		<if test="type != null">AND d.`umr_type`= #{type}</if>
+		order by umr_id desc
+		limit 1
+	</select>
+
+</mapper>

--
Gitblit v1.8.0