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/UserConnectHistoryMapper.xml | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/UserConnectHistoryMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/UserConnectHistoryMapper.xml
index 69528ae..f68260f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserConnectHistoryMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserConnectHistoryMapper.xml
@@ -1,69 +1,69 @@
-<?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.UserConnectHistoryMapper">
- <resultMap id="BaseResultMap"
- type="com.yeshi.fanli.entity.bus.user.UserConnectHistory">
- <id column="uch_id" property="id" jdbcType="BIGINT" />
- <result column="uch_log_url" property="logUrl" jdbcType="VARCHAR" />
- <result column="uch_createtime" property="createTime" jdbcType="TIMESTAMP" />
- <association property="mainUser" column="uch_main_uid"
- resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
- <association property="lessUser" column="uch_less_uid"
- resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
- </resultMap>
- <sql id="Base_Column_List">uch_id,uch_main_uid,uch_less_uid,uch_log_url,uch_createtime
- </sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap"
- parameterType="java.lang.Long">
- select
- <include refid="Base_Column_List" />
- from yeshi_ec_user_connect_history where uch_id =
- #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
- yeshi_ec_user_connect_history where uch_id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory"
- useGeneratedKeys="true" keyProperty="id">insert into
- yeshi_ec_user_connect_history
- (uch_id,uch_main_uid,uch_less_uid,uch_log_url,uch_createtime) values
- (#{id,jdbcType=BIGINT},#{mainUser.id,jdbcType=BIGINT},#{lessUser.id,jdbcType=BIGINT},#{logUrl,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
- </insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory"
- useGeneratedKeys="true" keyProperty="id">
- insert into yeshi_ec_user_connect_history
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">uch_id,</if>
- <if test="mainUser != null">uch_main_uid,</if>
- <if test="lessUser != null">uch_less_uid,</if>
- <if test="logUrl != null">uch_log_url,</if>
- <if test="createTime != null">uch_createtime,</if>
- </trim>
- values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="mainUser != null">#{mainUser.id,jdbcType=BIGINT},</if>
- <if test="lessUser != null">#{lessUser.id,jdbcType=BIGINT},</if>
- <if test="logUrl != null">#{logUrl,jdbcType=VARCHAR},</if>
- <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory">update
- yeshi_ec_user_connect_history set uch_main_uid =
- #{mainUser.id,jdbcType=BIGINT},uch_less_uid =
- #{lessUser.id,jdbcType=BIGINT},uch_log_url =
- #{logUrl,jdbcType=VARCHAR},uch_createtime =
- #{createTime,jdbcType=TIMESTAMP} where uch_id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory">
- update yeshi_ec_user_connect_history
- <set>
- <if test="mainUser != null">uch_main_uid=#{mainUser.id,jdbcType=BIGINT},</if>
- <if test="lessUser != null">uch_less_uid=#{lessUser.id,jdbcType=BIGINT},</if>
- <if test="logUrl != null">uch_log_url=#{logUrl,jdbcType=VARCHAR},</if>
- <if test="createTime != null">uch_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
- </set>
- where uch_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.UserConnectHistoryMapper">
+ <resultMap id="BaseResultMap"
+ type="com.yeshi.fanli.entity.bus.user.UserConnectHistory">
+ <id column="uch_id" property="id" jdbcType="BIGINT" />
+ <result column="uch_log_url" property="logUrl" jdbcType="VARCHAR" />
+ <result column="uch_createtime" property="createTime" jdbcType="TIMESTAMP" />
+ <association property="mainUser" column="uch_main_uid"
+ resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
+ <association property="lessUser" column="uch_less_uid"
+ resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
+ </resultMap>
+ <sql id="Base_Column_List">uch_id,uch_main_uid,uch_less_uid,uch_log_url,uch_createtime
+ </sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap"
+ parameterType="java.lang.Long">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_user_connect_history where uch_id =
+ #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+ yeshi_ec_user_connect_history where uch_id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory"
+ useGeneratedKeys="true" keyProperty="id">insert into
+ yeshi_ec_user_connect_history
+ (uch_id,uch_main_uid,uch_less_uid,uch_log_url,uch_createtime) values
+ (#{id,jdbcType=BIGINT},#{mainUser.id,jdbcType=BIGINT},#{lessUser.id,jdbcType=BIGINT},#{logUrl,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
+ </insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory"
+ useGeneratedKeys="true" keyProperty="id">
+ insert into yeshi_ec_user_connect_history
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">uch_id,</if>
+ <if test="mainUser != null">uch_main_uid,</if>
+ <if test="lessUser != null">uch_less_uid,</if>
+ <if test="logUrl != null">uch_log_url,</if>
+ <if test="createTime != null">uch_createtime,</if>
+ </trim>
+ values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="mainUser != null">#{mainUser.id,jdbcType=BIGINT},</if>
+ <if test="lessUser != null">#{lessUser.id,jdbcType=BIGINT},</if>
+ <if test="logUrl != null">#{logUrl,jdbcType=VARCHAR},</if>
+ <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory">update
+ yeshi_ec_user_connect_history set uch_main_uid =
+ #{mainUser.id,jdbcType=BIGINT},uch_less_uid =
+ #{lessUser.id,jdbcType=BIGINT},uch_log_url =
+ #{logUrl,jdbcType=VARCHAR},uch_createtime =
+ #{createTime,jdbcType=TIMESTAMP} where uch_id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserConnectHistory">
+ update yeshi_ec_user_connect_history
+ <set>
+ <if test="mainUser != null">uch_main_uid=#{mainUser.id,jdbcType=BIGINT},</if>
+ <if test="lessUser != null">uch_less_uid=#{lessUser.id,jdbcType=BIGINT},</if>
+ <if test="logUrl != null">uch_log_url=#{logUrl,jdbcType=VARCHAR},</if>
+ <if test="createTime != null">uch_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
+ </set>
+ where uch_id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
--
Gitblit v1.8.0