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/AlipayAccountValidNormalHistoryMapper.xml |  182 ++++++++++++++++++++++----------------------
 1 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/AlipayAccountValidNormalHistoryMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/AlipayAccountValidNormalHistoryMapper.xml
index 9a6e29d..8751937 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/AlipayAccountValidNormalHistoryMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/AlipayAccountValidNormalHistoryMapper.xml
@@ -1,91 +1,91 @@
-<?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.AlipayAccountValidNormalHistoryMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory">
-		<id column="avnh_id" property="id" jdbcType="BIGINT" />
-		<result column="avnh_uid" property="uid" jdbcType="BIGINT" />
-		<result column="avnh_account" property="account" jdbcType="VARCHAR" />
-		<result column="avnh_name" property="name" jdbcType="VARCHAR" />
-		<result column="avnh_state" property="state" jdbcType="INTEGER" />
-		<result column="avnh_createtime" property="createTime"
-			jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">avnh_id,avnh_uid,avnh_account,avnh_name,avnh_state,avnh_createtime
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_alipayaccount_valid_normal_history where avnh_id =
-		#{id,jdbcType=BIGINT} order by avnh_createtime desc limit 1
-	</select>
-
-
-	<select id="selectLatestByUid" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_alipayaccount_valid_normal_history  where avnh_uid =
-		#{0} order by avnh_createtime desc limit 1 for update
-	</select>
-
-
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_alipayaccount_valid_normal_history where avnh_id =
-		#{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert"
-		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_alipayaccount_valid_normal_history
-		(avnh_id,avnh_uid,avnh_account,avnh_name,avnh_state,avnh_createtime)
-		values
-		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{account,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective"
-		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_alipayaccount_valid_normal_history
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">avnh_id,</if>
-			<if test="uid != null">avnh_uid,</if>
-			<if test="account != null">avnh_account,</if>
-			<if test="name != null">avnh_name,</if>
-			<if test="state != null">avnh_state,</if>
-			<if test="createTime != null">avnh_createtime,</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="account != null">#{account,jdbcType=VARCHAR},</if>
-			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
-			<if test="state != null">#{state,jdbcType=INTEGER},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey"
-		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory">update yeshi_ec_alipayaccount_valid_normal_history set
-		avnh_uid = #{uid,jdbcType=BIGINT},avnh_account =
-		#{account,jdbcType=VARCHAR},avnh_name =
-		#{name,jdbcType=VARCHAR},avnh_state =
-		#{state,jdbcType=INTEGER},avnh_createtime =
-		#{createTime,jdbcType=TIMESTAMP} where avnh_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective"
-		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory">
-		update yeshi_ec_alipayaccount_valid_normal_history
-		<set>
-			<if test="uid != null">avnh_uid=#{uid,jdbcType=BIGINT},</if>
-			<if test="account != null">avnh_account=#{account,jdbcType=VARCHAR},</if>
-			<if test="name != null">avnh_name=#{name,jdbcType=VARCHAR},</if>
-			<if test="state != null">avnh_state=#{state,jdbcType=INTEGER},</if>
-			<if test="createTime != null">avnh_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
-		</set>
-		where avnh_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.AlipayAccountValidNormalHistoryMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory">
+		<id column="avnh_id" property="id" jdbcType="BIGINT" />
+		<result column="avnh_uid" property="uid" jdbcType="BIGINT" />
+		<result column="avnh_account" property="account" jdbcType="VARCHAR" />
+		<result column="avnh_name" property="name" jdbcType="VARCHAR" />
+		<result column="avnh_state" property="state" jdbcType="INTEGER" />
+		<result column="avnh_createtime" property="createTime"
+			jdbcType="TIMESTAMP" />
+	</resultMap>
+	<sql id="Base_Column_List">avnh_id,avnh_uid,avnh_account,avnh_name,avnh_state,avnh_createtime
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_alipayaccount_valid_normal_history where avnh_id =
+		#{id,jdbcType=BIGINT} order by avnh_createtime desc limit 1
+	</select>
+
+
+	<select id="selectLatestByUid" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_alipayaccount_valid_normal_history  where avnh_uid =
+		#{0} order by avnh_createtime desc limit 1 for update
+	</select>
+
+
+
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_alipayaccount_valid_normal_history where avnh_id =
+		#{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert"
+		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_alipayaccount_valid_normal_history
+		(avnh_id,avnh_uid,avnh_account,avnh_name,avnh_state,avnh_createtime)
+		values
+		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{account,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP})
+	</insert>
+	<insert id="insertSelective"
+		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_alipayaccount_valid_normal_history
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">avnh_id,</if>
+			<if test="uid != null">avnh_uid,</if>
+			<if test="account != null">avnh_account,</if>
+			<if test="name != null">avnh_name,</if>
+			<if test="state != null">avnh_state,</if>
+			<if test="createTime != null">avnh_createtime,</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="account != null">#{account,jdbcType=VARCHAR},</if>
+			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
+			<if test="state != null">#{state,jdbcType=INTEGER},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey"
+		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory">update yeshi_ec_alipayaccount_valid_normal_history set
+		avnh_uid = #{uid,jdbcType=BIGINT},avnh_account =
+		#{account,jdbcType=VARCHAR},avnh_name =
+		#{name,jdbcType=VARCHAR},avnh_state =
+		#{state,jdbcType=INTEGER},avnh_createtime =
+		#{createTime,jdbcType=TIMESTAMP} where avnh_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective"
+		parameterType="com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory">
+		update yeshi_ec_alipayaccount_valid_normal_history
+		<set>
+			<if test="uid != null">avnh_uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="account != null">avnh_account=#{account,jdbcType=VARCHAR},</if>
+			<if test="name != null">avnh_name=#{name,jdbcType=VARCHAR},</if>
+			<if test="state != null">avnh_state=#{state,jdbcType=INTEGER},</if>
+			<if test="createTime != null">avnh_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
+		</set>
+		where avnh_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0