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/monitor/ClientAPIMonitorMapper.xml |  168 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/monitor/ClientAPIMonitorMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/monitor/ClientAPIMonitorMapper.xml
index 2befdb6..11eebc8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/monitor/ClientAPIMonitorMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/monitor/ClientAPIMonitorMapper.xml
@@ -1,84 +1,84 @@
-<?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.monitor.ClientAPIMonitorMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.monitor.ClientAPIMonitor">
-		<id column="mca_id" property="id" jdbcType="BIGINT" />
-		<result column="mca_url" property="url" jdbcType="VARCHAR" />
-		<result column="mca_ip" property="ip" jdbcType="VARCHAR" />
-		<result column="mca_request_data" property="requestData"
-			jdbcType="VARCHAR" />
-			
-		<result column="mca_code" property="code" jdbcType="INTEGER" />
-		<result column="mca_time" property="time" jdbcType="INTEGER" />
-		<result column="mca_createtime" property="createTime" jdbcType="TIMESTAMP" />
-		<result column="mca_beizhu" property="beiZhu" jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="Base_Column_List">mca_id,mca_url,mca_ip,mca_request_data,mca_code,mca_time,mca_createtime,mca_beizhu
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_monitor_client_api where mca_id = #{id,jdbcType=BIGINT}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_monitor_client_api where mca_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_monitor_client_api
-		(mca_id,mca_url,mca_ip,mca_request_data,mca_code,mca_time,mca_createtime,mca_beizhu)
-		values
-		(#{id,jdbcType=BIGINT},#{url,jdbcType=VARCHAR},#{ip,jdbcType=VARCHAR},#{requestData,jdbcType=VARCHAR},#{code,jdbcType=INTEGER},#{time,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{beiZhu,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_monitor_client_api
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">mca_id,</if>
-			<if test="url != null">mca_url,</if>
-			<if test="ip != null">mca_ip,</if>
-			<if test="requestData != null">mca_request_data,</if>
-			<if test="code != null">mca_code,</if>
-			<if test="time != null">mca_time,</if>
-			<if test="createTime != null">mca_createtime,</if>
-			<if test="beiZhu != null">mca_beizhu,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="url != null">#{url,jdbcType=VARCHAR},</if>
-			<if test="ip != null">#{ip,jdbcType=VARCHAR},</if>
-			<if test="requestData != null">#{requestData,jdbcType=VARCHAR},</if>
-			<if test="code != null">#{code,jdbcType=INTEGER},</if>
-			<if test="time != null">#{time,jdbcType=INTEGER},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor">update
-		yeshi_ec_monitor_client_api set mca_url =
-		#{url,jdbcType=VARCHAR},mca_ip =
-		#{ip,jdbcType=VARCHAR},mca_request_data =
-		#{requestData,jdbcType=VARCHAR},mca_code =
-		#{code,jdbcType=INTEGER},mca_time =
-		#{time,jdbcType=INTEGER},mca_createtime =
-		#{createTime,jdbcType=TIMESTAMP},mca_beizhu =
-		#{beiZhu,jdbcType=VARCHAR} where mca_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor">
-		update yeshi_ec_monitor_client_api
-		<set>
-			<if test="url != null">mca_url=#{url,jdbcType=VARCHAR},</if>
-			<if test="ip != null">mca_ip=#{ip,jdbcType=VARCHAR},</if>
-			<if test="requestData != null">mca_request_data=#{requestData,jdbcType=VARCHAR},</if>
-			<if test="code != null">mca_code=#{code,jdbcType=INTEGER},</if>
-			<if test="time != null">mca_time=#{time,jdbcType=INTEGER},</if>
-			<if test="createTime != null">mca_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="beiZhu != null">mca_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
-		</set>
-		where mca_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.monitor.ClientAPIMonitorMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.monitor.ClientAPIMonitor">
+		<id column="mca_id" property="id" jdbcType="BIGINT" />
+		<result column="mca_url" property="url" jdbcType="VARCHAR" />
+		<result column="mca_ip" property="ip" jdbcType="VARCHAR" />
+		<result column="mca_request_data" property="requestData"
+			jdbcType="VARCHAR" />
+			
+		<result column="mca_code" property="code" jdbcType="INTEGER" />
+		<result column="mca_time" property="time" jdbcType="INTEGER" />
+		<result column="mca_createtime" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="mca_beizhu" property="beiZhu" jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">mca_id,mca_url,mca_ip,mca_request_data,mca_code,mca_time,mca_createtime,mca_beizhu
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_monitor_client_api where mca_id = #{id,jdbcType=BIGINT}
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_monitor_client_api where mca_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_monitor_client_api
+		(mca_id,mca_url,mca_ip,mca_request_data,mca_code,mca_time,mca_createtime,mca_beizhu)
+		values
+		(#{id,jdbcType=BIGINT},#{url,jdbcType=VARCHAR},#{ip,jdbcType=VARCHAR},#{requestData,jdbcType=VARCHAR},#{code,jdbcType=INTEGER},#{time,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{beiZhu,jdbcType=VARCHAR})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_monitor_client_api
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">mca_id,</if>
+			<if test="url != null">mca_url,</if>
+			<if test="ip != null">mca_ip,</if>
+			<if test="requestData != null">mca_request_data,</if>
+			<if test="code != null">mca_code,</if>
+			<if test="time != null">mca_time,</if>
+			<if test="createTime != null">mca_createtime,</if>
+			<if test="beiZhu != null">mca_beizhu,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="url != null">#{url,jdbcType=VARCHAR},</if>
+			<if test="ip != null">#{ip,jdbcType=VARCHAR},</if>
+			<if test="requestData != null">#{requestData,jdbcType=VARCHAR},</if>
+			<if test="code != null">#{code,jdbcType=INTEGER},</if>
+			<if test="time != null">#{time,jdbcType=INTEGER},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor">update
+		yeshi_ec_monitor_client_api set mca_url =
+		#{url,jdbcType=VARCHAR},mca_ip =
+		#{ip,jdbcType=VARCHAR},mca_request_data =
+		#{requestData,jdbcType=VARCHAR},mca_code =
+		#{code,jdbcType=INTEGER},mca_time =
+		#{time,jdbcType=INTEGER},mca_createtime =
+		#{createTime,jdbcType=TIMESTAMP},mca_beizhu =
+		#{beiZhu,jdbcType=VARCHAR} where mca_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.monitor.ClientAPIMonitor">
+		update yeshi_ec_monitor_client_api
+		<set>
+			<if test="url != null">mca_url=#{url,jdbcType=VARCHAR},</if>
+			<if test="ip != null">mca_ip=#{ip,jdbcType=VARCHAR},</if>
+			<if test="requestData != null">mca_request_data=#{requestData,jdbcType=VARCHAR},</if>
+			<if test="code != null">mca_code=#{code,jdbcType=INTEGER},</if>
+			<if test="time != null">mca_time=#{time,jdbcType=INTEGER},</if>
+			<if test="createTime != null">mca_createtime=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="beiZhu != null">mca_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
+		</set>
+		where mca_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0