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/UserActiveLogMapper.xml |  208 ++++++++++++++++++++++++++--------------------------
 1 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml
index 8abb053..7915201 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml
@@ -1,104 +1,104 @@
-<?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.UserActiveLogMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserActiveLog">
-		<id column="lua_id" property="id" jdbcType="BIGINT" />
-		<result column="lua_uid" property="uid" jdbcType="BIGINT" />
-		<result column="lua_ip" property="ip" jdbcType="VARCHAR" />
-		<result column="lua_channel" property="channel" jdbcType="VARCHAR" />
-		<result column="lua_version_code" property="versionCode"
-			jdbcType="VARCHAR" />
-		<result column="lua_createtime" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="lua_updatetime" property="updateTime" jdbcType="TIMESTAMP" />
-		<result column="lua_device_type" property="deviceType"
-			jdbcType="VARCHAR" />
-		<result column="lua_os_version" property="osVersion" jdbcType="VARCHAR" />
-		<result column="lua_device" property="device" jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="Base_Column_List">lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version,lua_device
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}
-	</select>
-	<select id="selectLatestByUid" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id
-		desc limit 1
-	</select>
-	<select id="selectFirstActiveInfo" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id
-		limit 1
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_log_user_active
-		(lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version,lua_device)
-		values
-		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{ip,jdbcType=VARCHAR},#{channel,jdbcType=VARCHAR},#{versionCode,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{deviceType,jdbcType=VARCHAR},#{osVersion,jdbcType=VARCHAR},#{device,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_log_user_active
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">lua_id,</if>
-			<if test="uid != null">lua_uid,</if>
-			<if test="ip != null">lua_ip,</if>
-			<if test="channel != null">lua_channel,</if>
-			<if test="versionCode != null">lua_version_code,</if>
-			<if test="createTime != null">lua_createtime,</if>
-			<if test="updateTime != null">lua_updatetime,</if>
-			<if test="deviceType != null">lua_device_type,</if>
-			<if test="osVersion != null">lua_os_version,</if>
-			<if test="device != null">lua_device,</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="ip != null">#{ip,jdbcType=VARCHAR},</if>
-			<if test="channel != null">#{channel,jdbcType=VARCHAR},</if>
-			<if test="versionCode != null">#{versionCode,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="deviceType != null">#{deviceType,jdbcType=VARCHAR},</if>
-			<if test="osVersion != null">#{osVersion,jdbcType=VARCHAR},</if>
-			<if test="device != null">#{device,jdbcType=VARCHAR}</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog">update
-		yeshi_ec_log_user_active set lua_uid = #{uid,jdbcType=BIGINT},lua_ip =
-		#{ip,jdbcType=VARCHAR},lua_channel =
-		#{channel,jdbcType=VARCHAR},lua_version_code =
-		#{versionCode,jdbcType=VARCHAR},lua_createtime =
-		#{createTime,jdbcType=TIMESTAMP},lua_updatetime =
-		#{updateTime,jdbcType=TIMESTAMP} ,lua_device_type
-		=#{deviceType,jdbcType=VARCHAR} ,lua_os_version
-		=#{osVersion,jdbcType=VARCHAR},lua_device
-		=#{device,jdbcType=VARCHAR} where lua_id = #{id,jdbcType=BIGINT}</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog">
-		update yeshi_ec_log_user_active
-		<set>
-			<if test="uid != null">lua_uid=#{uid,jdbcType=BIGINT},</if>
-			<if test="ip != null">lua_ip=#{ip,jdbcType=VARCHAR},</if>
-			<if test="channel != null">lua_channel=#{channel,jdbcType=VARCHAR},</if>
-			<if test="versionCode != null">lua_version_code=#{versionCode,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">lua_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">lua_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="deviceType !=null">lua_device_type =#{deviceType,jdbcType=VARCHAR},</if>
-			<if test="osVersion !=null">lua_os_version =#{osVersion,jdbcType=VARCHAR},</if>
-			<if test="device !=null">lua_device =#{device,jdbcType=VARCHAR},</if>
-		</set>
-		where lua_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.UserActiveLogMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserActiveLog">
+		<id column="lua_id" property="id" jdbcType="BIGINT" />
+		<result column="lua_uid" property="uid" jdbcType="BIGINT" />
+		<result column="lua_ip" property="ip" jdbcType="VARCHAR" />
+		<result column="lua_channel" property="channel" jdbcType="VARCHAR" />
+		<result column="lua_version_code" property="versionCode"
+			jdbcType="VARCHAR" />
+		<result column="lua_createtime" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="lua_updatetime" property="updateTime" jdbcType="TIMESTAMP" />
+		<result column="lua_device_type" property="deviceType"
+			jdbcType="VARCHAR" />
+		<result column="lua_os_version" property="osVersion" jdbcType="VARCHAR" />
+		<result column="lua_device" property="device" jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version,lua_device
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}
+	</select>
+	<select id="selectLatestByUid" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id
+		desc limit 1
+	</select>
+	<select id="selectFirstActiveInfo" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id
+		limit 1
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_log_user_active
+		(lua_id,lua_uid,lua_ip,lua_channel,lua_version_code,lua_createtime,lua_updatetime,lua_device_type,lua_os_version,lua_device)
+		values
+		(#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{ip,jdbcType=VARCHAR},#{channel,jdbcType=VARCHAR},#{versionCode,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{deviceType,jdbcType=VARCHAR},#{osVersion,jdbcType=VARCHAR},#{device,jdbcType=VARCHAR})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_log_user_active
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">lua_id,</if>
+			<if test="uid != null">lua_uid,</if>
+			<if test="ip != null">lua_ip,</if>
+			<if test="channel != null">lua_channel,</if>
+			<if test="versionCode != null">lua_version_code,</if>
+			<if test="createTime != null">lua_createtime,</if>
+			<if test="updateTime != null">lua_updatetime,</if>
+			<if test="deviceType != null">lua_device_type,</if>
+			<if test="osVersion != null">lua_os_version,</if>
+			<if test="device != null">lua_device,</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="ip != null">#{ip,jdbcType=VARCHAR},</if>
+			<if test="channel != null">#{channel,jdbcType=VARCHAR},</if>
+			<if test="versionCode != null">#{versionCode,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="deviceType != null">#{deviceType,jdbcType=VARCHAR},</if>
+			<if test="osVersion != null">#{osVersion,jdbcType=VARCHAR},</if>
+			<if test="device != null">#{device,jdbcType=VARCHAR}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog">update
+		yeshi_ec_log_user_active set lua_uid = #{uid,jdbcType=BIGINT},lua_ip =
+		#{ip,jdbcType=VARCHAR},lua_channel =
+		#{channel,jdbcType=VARCHAR},lua_version_code =
+		#{versionCode,jdbcType=VARCHAR},lua_createtime =
+		#{createTime,jdbcType=TIMESTAMP},lua_updatetime =
+		#{updateTime,jdbcType=TIMESTAMP} ,lua_device_type
+		=#{deviceType,jdbcType=VARCHAR} ,lua_os_version
+		=#{osVersion,jdbcType=VARCHAR},lua_device
+		=#{device,jdbcType=VARCHAR} where lua_id = #{id,jdbcType=BIGINT}</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserActiveLog">
+		update yeshi_ec_log_user_active
+		<set>
+			<if test="uid != null">lua_uid=#{uid,jdbcType=BIGINT},</if>
+			<if test="ip != null">lua_ip=#{ip,jdbcType=VARCHAR},</if>
+			<if test="channel != null">lua_channel=#{channel,jdbcType=VARCHAR},</if>
+			<if test="versionCode != null">lua_version_code=#{versionCode,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">lua_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">lua_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="deviceType !=null">lua_device_type =#{deviceType,jdbcType=VARCHAR},</if>
+			<if test="osVersion !=null">lua_os_version =#{osVersion,jdbcType=VARCHAR},</if>
+			<if test="device !=null">lua_device =#{device,jdbcType=VARCHAR},</if>
+		</set>
+		where lua_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0