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/push/DeviceTokenIOSMapper.xml |  268 ++++++++++++++++++++++++++--------------------------
 1 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenIOSMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenIOSMapper.xml
index 405c05f..85ece16 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenIOSMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceTokenIOSMapper.xml
@@ -1,134 +1,134 @@
-<?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.push.DeviceTokenIOSMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.push.DeviceTokenIOS">
-		<id column="id" property="id" jdbcType="BIGINT" />
-		<result column="uid" property="uid" jdbcType="BIGINT" />
-		<result column="device_token" property="deviceToken" jdbcType="VARCHAR" />
-		<result column="device" property="device" jdbcType="VARCHAR" />
-		<result column="version" property="version" jdbcType="INTEGER" />
-		<result column="createtime" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="updatetime" property="updateTime" jdbcType="TIMESTAMP" />
-		<result column="device_token_md5" property="deviceTokenMd5"
-			jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="Base_Column_List">id,uid,device_token,device,createtime,updatetime,version,device_token_md5
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_ios where id = #{id,jdbcType=BIGINT}
-	</select>
-	<select id="selectByDevice" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_ios where device = #{0} limit 1
-	</select>
-	
-	<select id="selectByDeviceForUpdate" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_ios where device = #{0} limit 1 for update
-	</select>
-
-	<select id="selectByDeviceToken" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_ios where device_token = #{0} limit 1
-	</select>
-
-
-	<select id="selectByUid" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_ios WHERE uid = #{uid}
-		 <if test="list != null and list.size() > 0">
-		 	AND version in
-		 	<foreach collection="list" item="item" open="(" separator="," close=")">
-		 		#{item}
-		 	</foreach>
-		 </if>
-	</select>
-	<select id="selectList" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_uid_devicetoken_ios 
-		 <if test="list != null and list.size() > 0">
-		 	WHERE version in
-		 	<foreach collection="list" item="item" open="(" separator="," close=")">
-		 		#{item}
-		 	</foreach>
-		 </if>
-		limit #{start},#{count}
-	</select>
-	
-	<select id="selectCount" resultType="java.lang.Long">
-		select count(id) from
-		yeshi_ec_uid_devicetoken_ios
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_uid_devicetoken_ios where id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_uid_devicetoken_ios
-		(id,uid,device_token,device,createtime,updatetime,`version`,device_token_md5,version)
-		values
-		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{deviceToken,jdbcType=VARCHAR},#{device,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{version,jdbcType=INTEGER},#{deviceTokenMd5,jdbcType=VARCHAR},#{version,jdbcType=INTEGER})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_uid_devicetoken_ios
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">id,</if>
-			<if test="uid != null">uid,</if>
-			<if test="deviceToken != null">device_token,</if>
-			<if test="device != null">device,</if>
-			<if test="createTime != null">createtime,</if>
-			<if test="updateTime != null">updatetime,</if>
-			<if test="version != null">version,</if>
-			<if test="deviceTokenMd5 != null">device_token_md5,</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="deviceToken != null">#{deviceToken,jdbcType=VARCHAR},</if>
-			<if test="device != null">#{device,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="version != null">#{version,jdbcType=INTEGER},</if>
-			<if test="deviceTokenMd5 != null">#{deviceTokenMd5,jdbcType=VARCHAR}</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS">update
-		yeshi_ec_uid_devicetoken_ios set uid =
-		#{uid,jdbcType=BIGINT},device_token =
-		#{deviceToken,jdbcType=VARCHAR},device =
-		#{device,jdbcType=VARCHAR},createtime =
-		#{createTime,jdbcType=TIMESTAMP},updatetime =
-		#{updateTime,jdbcType=TIMESTAMP},version = #{version,jdbcType=INTEGER}
-		,device_token_md5 =#{deviceTokenMd5,jdbcType=VARCHAR} where id =
-		#{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS">
-		update yeshi_ec_uid_devicetoken_ios
-		<set>
-			<if test="uid != null">uid=#{uid,jdbcType=BIGINT},</if>
-			<if test="deviceToken != null">device_token=#{deviceToken,jdbcType=VARCHAR},</if>
-			<if test="device != null">device=#{device,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">createtime=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="version != null">version=#{version,jdbcType=INTEGER},</if>
-			<if test="deviceTokenMd5 !=null">device_token_md5 =#{deviceTokenMd5,jdbcType=VARCHAR},
-			</if>
-		</set>
-		where 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.push.DeviceTokenIOSMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.push.DeviceTokenIOS">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="uid" property="uid" jdbcType="BIGINT" />
+		<result column="device_token" property="deviceToken" jdbcType="VARCHAR" />
+		<result column="device" property="device" jdbcType="VARCHAR" />
+		<result column="version" property="version" jdbcType="INTEGER" />
+		<result column="createtime" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="updatetime" property="updateTime" jdbcType="TIMESTAMP" />
+		<result column="device_token_md5" property="deviceTokenMd5"
+			jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">id,uid,device_token,device,createtime,updatetime,version,device_token_md5
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_ios where id = #{id,jdbcType=BIGINT}
+	</select>
+	<select id="selectByDevice" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_ios where device = #{0} limit 1
+	</select>
+	
+	<select id="selectByDeviceForUpdate" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_ios where device = #{0} limit 1 for update
+	</select>
+
+	<select id="selectByDeviceToken" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_ios where device_token = #{0} limit 1
+	</select>
+
+
+	<select id="selectByUid" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_ios WHERE uid = #{uid}
+		 <if test="list != null and list.size() > 0">
+		 	AND version in
+		 	<foreach collection="list" item="item" open="(" separator="," close=")">
+		 		#{item}
+		 	</foreach>
+		 </if>
+	</select>
+	<select id="selectList" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_uid_devicetoken_ios 
+		 <if test="list != null and list.size() > 0">
+		 	WHERE version in
+		 	<foreach collection="list" item="item" open="(" separator="," close=")">
+		 		#{item}
+		 	</foreach>
+		 </if>
+		limit #{start},#{count}
+	</select>
+	
+	<select id="selectCount" resultType="java.lang.Long">
+		select count(id) from
+		yeshi_ec_uid_devicetoken_ios
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_uid_devicetoken_ios where id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_uid_devicetoken_ios
+		(id,uid,device_token,device,createtime,updatetime,`version`,device_token_md5,version)
+		values
+		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{deviceToken,jdbcType=VARCHAR},#{device,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{version,jdbcType=INTEGER},#{deviceTokenMd5,jdbcType=VARCHAR},#{version,jdbcType=INTEGER})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_uid_devicetoken_ios
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="uid != null">uid,</if>
+			<if test="deviceToken != null">device_token,</if>
+			<if test="device != null">device,</if>
+			<if test="createTime != null">createtime,</if>
+			<if test="updateTime != null">updatetime,</if>
+			<if test="version != null">version,</if>
+			<if test="deviceTokenMd5 != null">device_token_md5,</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="deviceToken != null">#{deviceToken,jdbcType=VARCHAR},</if>
+			<if test="device != null">#{device,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="version != null">#{version,jdbcType=INTEGER},</if>
+			<if test="deviceTokenMd5 != null">#{deviceTokenMd5,jdbcType=VARCHAR}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS">update
+		yeshi_ec_uid_devicetoken_ios set uid =
+		#{uid,jdbcType=BIGINT},device_token =
+		#{deviceToken,jdbcType=VARCHAR},device =
+		#{device,jdbcType=VARCHAR},createtime =
+		#{createTime,jdbcType=TIMESTAMP},updatetime =
+		#{updateTime,jdbcType=TIMESTAMP},version = #{version,jdbcType=INTEGER}
+		,device_token_md5 =#{deviceTokenMd5,jdbcType=VARCHAR} where id =
+		#{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.DeviceTokenIOS">
+		update yeshi_ec_uid_devicetoken_ios
+		<set>
+			<if test="uid != null">uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="deviceToken != null">device_token=#{deviceToken,jdbcType=VARCHAR},</if>
+			<if test="device != null">device=#{device,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">createtime=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="version != null">version=#{version,jdbcType=INTEGER},</if>
+			<if test="deviceTokenMd5 !=null">device_token_md5 =#{deviceTokenMd5,jdbcType=VARCHAR},
+			</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0