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/UserInviteRecordMapper.xml |  114 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInviteRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInviteRecordMapper.xml
index bdf8782..c58463a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInviteRecordMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInviteRecordMapper.xml
@@ -1,57 +1,57 @@
-<?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.UserInviteRecordMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserInviteRecord">
-    <id column="uir_id" property="id" jdbcType="BIGINT"/>
-    <result column="uir_inviter_id" property="inviterId" jdbcType="BIGINT"/>
-    <result column="uir_wx_unionid" property="wxUnionid" jdbcType="VARCHAR"/>
-    <result column="uir_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    <result column="uir_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-  </resultMap>
-  <sql id="Base_Column_List">uir_id,uir_inviter_id,uir_wx_unionid,uir_create_time,uir_update_time</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_user_invite_record where uir_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_user_invite_record where uir_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_user_invite_record (uir_id,uir_inviter_id,uir_wx_unionid,uir_create_time,uir_update_time) values (#{id,jdbcType=BIGINT},#{inviterId,jdbcType=BIGINT},#{wxUnionid,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_user_invite_record
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">uir_id,</if>
-      <if test="inviterId != null">uir_inviter_id,</if>
-      <if test="wxUnionid != null">uir_wx_unionid,</if>
-      <if test="createTime != null">uir_create_time,</if>
-      <if test="updateTime != null">uir_update_time,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="inviterId != null">#{inviterId,jdbcType=BIGINT},</if>
-      <if test="wxUnionid != null">#{wxUnionid,jdbcType=VARCHAR},</if>
-      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord">update yeshi_user_invite_record set uir_inviter_id = #{inviterId,jdbcType=BIGINT},uir_wx_unionid = #{wxUnionid,jdbcType=VARCHAR},uir_create_time = #{createTime,jdbcType=TIMESTAMP},uir_update_time = #{updateTime,jdbcType=TIMESTAMP} where uir_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord">update yeshi_user_invite_record
-    <set>
-      <if test="inviterId != null">uir_inviter_id=#{inviterId,jdbcType=BIGINT},</if>
-      <if test="wxUnionid != null">uir_wx_unionid=#{wxUnionid,jdbcType=VARCHAR},</if>
-      <if test="createTime != null">uir_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-      <if test="updateTime != null">uir_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-    </set> where uir_id = #{id,jdbcType=BIGINT}
-  </update>
-  
-  <select id="getByInviterIdAndUnionid" resultMap="BaseResultMap">
-  	SELECT * FROM yeshi_user_invite_record d
-	WHERE d.`uir_inviter_id` = #{inviterId} AND d.`uir_wx_unionid`= #{wxUnionId}
-	LIMIT 1
-  </select>
-  
-  <select id="getNewestInviterId" resultType="java.lang.Long">
-  	SELECT uir_inviter_id FROM yeshi_user_invite_record d
-	WHERE d.`uir_wx_unionid`= #{wxUnionId}
-	ORDER BY d.`uir_update_time` 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.UserInviteRecordMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserInviteRecord">
+    <id column="uir_id" property="id" jdbcType="BIGINT"/>
+    <result column="uir_inviter_id" property="inviterId" jdbcType="BIGINT"/>
+    <result column="uir_wx_unionid" property="wxUnionid" jdbcType="VARCHAR"/>
+    <result column="uir_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="uir_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+  </resultMap>
+  <sql id="Base_Column_List">uir_id,uir_inviter_id,uir_wx_unionid,uir_create_time,uir_update_time</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_user_invite_record where uir_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_user_invite_record where uir_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_user_invite_record (uir_id,uir_inviter_id,uir_wx_unionid,uir_create_time,uir_update_time) values (#{id,jdbcType=BIGINT},#{inviterId,jdbcType=BIGINT},#{wxUnionid,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord" useGeneratedKeys="true" keyProperty="id">insert into yeshi_user_invite_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">uir_id,</if>
+      <if test="inviterId != null">uir_inviter_id,</if>
+      <if test="wxUnionid != null">uir_wx_unionid,</if>
+      <if test="createTime != null">uir_create_time,</if>
+      <if test="updateTime != null">uir_update_time,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="inviterId != null">#{inviterId,jdbcType=BIGINT},</if>
+      <if test="wxUnionid != null">#{wxUnionid,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord">update yeshi_user_invite_record set uir_inviter_id = #{inviterId,jdbcType=BIGINT},uir_wx_unionid = #{wxUnionid,jdbcType=VARCHAR},uir_create_time = #{createTime,jdbcType=TIMESTAMP},uir_update_time = #{updateTime,jdbcType=TIMESTAMP} where uir_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInviteRecord">update yeshi_user_invite_record
+    <set>
+      <if test="inviterId != null">uir_inviter_id=#{inviterId,jdbcType=BIGINT},</if>
+      <if test="wxUnionid != null">uir_wx_unionid=#{wxUnionid,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">uir_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">uir_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+    </set> where uir_id = #{id,jdbcType=BIGINT}
+  </update>
+  
+  <select id="getByInviterIdAndUnionid" resultMap="BaseResultMap">
+  	SELECT * FROM yeshi_user_invite_record d
+	WHERE d.`uir_inviter_id` = #{inviterId} AND d.`uir_wx_unionid`= #{wxUnionId}
+	LIMIT 1
+  </select>
+  
+  <select id="getNewestInviterId" resultType="java.lang.Long">
+  	SELECT uir_inviter_id FROM yeshi_user_invite_record d
+	WHERE d.`uir_wx_unionid`= #{wxUnionId}
+	ORDER BY d.`uir_update_time` DESC
+	LIMIT 1
+  </select>
+  
+</mapper>

--
Gitblit v1.8.0