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/UserRankRecordMapper.xml |   78 +++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankRecordMapper.xml
index f80b67d..33aa43c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankRecordMapper.xml
@@ -1,39 +1,39 @@
-<?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.UserRankRecordMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserRankRecord">
-    <id column="urd_id" property="id" jdbcType="BIGINT"/>
-    <result column="urd_uid" property="uid" jdbcType="BIGINT"/>
-    <result column="urd_rank_id" property="rankId" jdbcType="BIGINT"/>
-    <result column="urd_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-  </resultMap>
-  <sql id="Base_Column_List">urd_id,urd_uid,urd_rank_id,urd_create_time</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_user_rank_record where urd_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_rank_record where urd_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank_record (urd_id,urd_uid,urd_rank_id,urd_create_time) values (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{rankId,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank_record
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">urd_id,</if>
-      <if test="uid != null">urd_uid,</if>
-      <if test="rankId != null">urd_rank_id,</if>
-      <if test="createTime != null">urd_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="rankId != null">#{rankId,jdbcType=BIGINT},</if>
-      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord">update yeshi_ec_user_rank_record set urd_uid = #{uid,jdbcType=BIGINT},urd_rank_id = #{rankId,jdbcType=BIGINT},urd_create_time = #{createTime,jdbcType=TIMESTAMP} where urd_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord">update yeshi_ec_user_rank_record
-    <set>
-      <if test="uid != null">urd_uid=#{uid,jdbcType=BIGINT},</if>
-      <if test="rankId != null">urd_rank_id=#{rankId,jdbcType=BIGINT},</if>
-      <if test="createTime != null">urd_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-    </set> where urd_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.UserRankRecordMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserRankRecord">
+    <id column="urd_id" property="id" jdbcType="BIGINT"/>
+    <result column="urd_uid" property="uid" jdbcType="BIGINT"/>
+    <result column="urd_rank_id" property="rankId" jdbcType="BIGINT"/>
+    <result column="urd_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+  </resultMap>
+  <sql id="Base_Column_List">urd_id,urd_uid,urd_rank_id,urd_create_time</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_user_rank_record where urd_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_rank_record where urd_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank_record (urd_id,urd_uid,urd_rank_id,urd_create_time) values (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{rankId,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">urd_id,</if>
+      <if test="uid != null">urd_uid,</if>
+      <if test="rankId != null">urd_rank_id,</if>
+      <if test="createTime != null">urd_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="rankId != null">#{rankId,jdbcType=BIGINT},</if>
+      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord">update yeshi_ec_user_rank_record set urd_uid = #{uid,jdbcType=BIGINT},urd_rank_id = #{rankId,jdbcType=BIGINT},urd_create_time = #{createTime,jdbcType=TIMESTAMP} where urd_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRankRecord">update yeshi_ec_user_rank_record
+    <set>
+      <if test="uid != null">urd_uid=#{uid,jdbcType=BIGINT},</if>
+      <if test="rankId != null">urd_rank_id=#{rankId,jdbcType=BIGINT},</if>
+      <if test="createTime != null">urd_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+    </set> where urd_id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

--
Gitblit v1.8.0