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/UserComplaintMapper.xml |   98 ++++++++++++++++++++++++------------------------
 1 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserComplaintMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserComplaintMapper.xml
index 32444ef..e92290f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserComplaintMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserComplaintMapper.xml
@@ -1,49 +1,49 @@
-<?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.UserComplaintMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserComplaint">
-    <id column="ucp_id" property="id" jdbcType="BIGINT"/>
-    <result column="ucp_content" property="content" jdbcType="VARCHAR"/>
-    <result column="ucp_picture_list" property="pictureList" jdbcType="VARCHAR"/>
-    <result column="ucp_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-  
-  	<association property="userInfo" column="ucp_uid" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
-  		<id column="ucp_uid" property="id" jdbcType="BIGINT"/>
-  	</association>
-  
-  </resultMap>
-  
-  
-  <sql id="Base_Column_List">ucp_id,ucp_uid,ucp_content,ucp_picture_list,ucp_create_time</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_user_complaint where ucp_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_complaint where ucp_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_complaint (ucp_id,ucp_uid,ucp_content,ucp_picture_list,ucp_create_time) values (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{content,jdbcType=VARCHAR},#{pictureList,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_complaint
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">ucp_id,</if>
-      <if test="userInfo != null">ucp_uid,</if>
-      <if test="content != null">ucp_content,</if>
-      <if test="pictureList != null">ucp_picture_list,</if>
-      <if test="createTime != null">ucp_create_time,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="userInfo != null">#{userInfo.id,jdbcType=BIGINT},</if>
-      <if test="content != null">#{content,jdbcType=VARCHAR},</if>
-      <if test="pictureList != null">#{pictureList,jdbcType=VARCHAR},</if>
-      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint">update yeshi_ec_user_complaint set ucp_uid = #{userInfo.id,jdbcType=BIGINT},ucp_content = #{content,jdbcType=VARCHAR},ucp_picture_list = #{pictureList,jdbcType=VARCHAR},ucp_create_time = #{createTime,jdbcType=TIMESTAMP} where ucp_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint">update yeshi_ec_user_complaint
-    <set>
-      <if test="userInfo != null">ucp_uid=#{userInfo.id,jdbcType=BIGINT},</if>
-      <if test="content != null">ucp_content=#{content,jdbcType=VARCHAR},</if>
-      <if test="pictureList != null">ucp_picture_list=#{pictureList,jdbcType=VARCHAR},</if>
-      <if test="createTime != null">ucp_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-    </set> where ucp_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.UserComplaintMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserComplaint">
+    <id column="ucp_id" property="id" jdbcType="BIGINT"/>
+    <result column="ucp_content" property="content" jdbcType="VARCHAR"/>
+    <result column="ucp_picture_list" property="pictureList" jdbcType="VARCHAR"/>
+    <result column="ucp_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+  
+  	<association property="userInfo" column="ucp_uid" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
+  		<id column="ucp_uid" property="id" jdbcType="BIGINT"/>
+  	</association>
+  
+  </resultMap>
+  
+  
+  <sql id="Base_Column_List">ucp_id,ucp_uid,ucp_content,ucp_picture_list,ucp_create_time</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_user_complaint where ucp_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_complaint where ucp_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_complaint (ucp_id,ucp_uid,ucp_content,ucp_picture_list,ucp_create_time) values (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{content,jdbcType=VARCHAR},#{pictureList,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_complaint
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">ucp_id,</if>
+      <if test="userInfo != null">ucp_uid,</if>
+      <if test="content != null">ucp_content,</if>
+      <if test="pictureList != null">ucp_picture_list,</if>
+      <if test="createTime != null">ucp_create_time,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="userInfo != null">#{userInfo.id,jdbcType=BIGINT},</if>
+      <if test="content != null">#{content,jdbcType=VARCHAR},</if>
+      <if test="pictureList != null">#{pictureList,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint">update yeshi_ec_user_complaint set ucp_uid = #{userInfo.id,jdbcType=BIGINT},ucp_content = #{content,jdbcType=VARCHAR},ucp_picture_list = #{pictureList,jdbcType=VARCHAR},ucp_create_time = #{createTime,jdbcType=TIMESTAMP} where ucp_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserComplaint">update yeshi_ec_user_complaint
+    <set>
+      <if test="userInfo != null">ucp_uid=#{userInfo.id,jdbcType=BIGINT},</if>
+      <if test="content != null">ucp_content=#{content,jdbcType=VARCHAR},</if>
+      <if test="pictureList != null">ucp_picture_list=#{pictureList,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">ucp_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+    </set> where ucp_id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

--
Gitblit v1.8.0