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/UserInfoDeleteRecordMapper.xml |   94 +++++++++++++++++++++++-----------------------
 1 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoDeleteRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoDeleteRecordMapper.xml
index 2f820f0..f799d2e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoDeleteRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoDeleteRecordMapper.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.user.UserInfoDeleteRecordMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord">
-    <id column="udr_id" property="id" jdbcType="BIGINT"/>
-    <result column="udr_state" property="state" jdbcType="INTEGER"/>
-    <result column="udr_reason" property="reason" jdbcType="VARCHAR"/>
-    <result column="udr_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    
-     <association property="userInfo" column="udr_uid" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
-		<id column="udr_uid" property="id" jdbcType="BIGINT" />
-	</association>
-	
-  </resultMap>
-  <sql id="Base_Column_List">udr_id,udr_uid,udr_state,udr_reason,udr_create_time</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_user_delete_record where udr_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_delete_record where udr_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_delete_record (udr_id,udr_uid,udr_state,udr_reason,udr_create_time) values (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{state,jdbcType=INTEGER},#{reason,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_delete_record
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">udr_id,</if>
-      <if test="userInfo != null">udr_uid,</if>
-      <if test="state != null">udr_state,</if>
-      <if test="reason != null">udr_reason,</if>
-      <if test="createTime != null">udr_create_time,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="userInfo != null">#{userInfo.id,jdbcType=BIGINT},</if>
-      <if test="state != null">#{state,jdbcType=INTEGER},</if>
-      <if test="reason != null">#{reason,jdbcType=VARCHAR},</if>
-      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord">update yeshi_ec_user_delete_record set udr_uid = #{userInfo.id,jdbcType=BIGINT},udr_state = #{state,jdbcType=INTEGER},udr_reason = #{reason,jdbcType=VARCHAR},udr_create_time = #{createTime,jdbcType=TIMESTAMP} where udr_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord">update yeshi_ec_user_delete_record
-    <set>
-      <if test="userInfo != null">udr_uid=#{userInfo.id,jdbcType=BIGINT},</if>
-      <if test="state != null">udr_state=#{state,jdbcType=INTEGER},</if>
-      <if test="reason != null">udr_reason=#{reason,jdbcType=VARCHAR},</if>
-      <if test="createTime != null">udr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-    </set> where udr_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.user.UserInfoDeleteRecordMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord">
+    <id column="udr_id" property="id" jdbcType="BIGINT"/>
+    <result column="udr_state" property="state" jdbcType="INTEGER"/>
+    <result column="udr_reason" property="reason" jdbcType="VARCHAR"/>
+    <result column="udr_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    
+     <association property="userInfo" column="udr_uid" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
+		<id column="udr_uid" property="id" jdbcType="BIGINT" />
+	</association>
+	
+  </resultMap>
+  <sql id="Base_Column_List">udr_id,udr_uid,udr_state,udr_reason,udr_create_time</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_user_delete_record where udr_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_delete_record where udr_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_delete_record (udr_id,udr_uid,udr_state,udr_reason,udr_create_time) values (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{state,jdbcType=INTEGER},#{reason,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_delete_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">udr_id,</if>
+      <if test="userInfo != null">udr_uid,</if>
+      <if test="state != null">udr_state,</if>
+      <if test="reason != null">udr_reason,</if>
+      <if test="createTime != null">udr_create_time,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="userInfo != null">#{userInfo.id,jdbcType=BIGINT},</if>
+      <if test="state != null">#{state,jdbcType=INTEGER},</if>
+      <if test="reason != null">#{reason,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord">update yeshi_ec_user_delete_record set udr_uid = #{userInfo.id,jdbcType=BIGINT},udr_state = #{state,jdbcType=INTEGER},udr_reason = #{reason,jdbcType=VARCHAR},udr_create_time = #{createTime,jdbcType=TIMESTAMP} where udr_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoDeleteRecord">update yeshi_ec_user_delete_record
+    <set>
+      <if test="userInfo != null">udr_uid=#{userInfo.id,jdbcType=BIGINT},</if>
+      <if test="state != null">udr_state=#{state,jdbcType=INTEGER},</if>
+      <if test="reason != null">udr_reason=#{reason,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">udr_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+    </set> where udr_id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

--
Gitblit v1.8.0