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/activity/ActivityUserMapper.xml |  162 +++++++++++++++++++++++++++---------------------------
 1 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml
index 8802927..e2ef75f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/activity/ActivityUserMapper.xml
@@ -1,81 +1,81 @@
-<?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.activity.ActivityUserMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.bus.activity.ActivityUser">
-		<id column="au_id" property="id" jdbcType="BIGINT" />
-		<result column="au_nick_name" property="nickName" jdbcType="VARCHAR" />
-		<result column="au_portrait" property="portrait" jdbcType="VARCHAR" />
-		<result column="au_create_time" property="createTime" jdbcType="TIMESTAMP" />
-	</resultMap>
-	<sql id="Base_Column_List">au_id,au_nick_name,au_portrait,au_create_time</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_activity_user where au_id = #{0}
-	</select>
-
-	<select id="selectList" resultMap="BaseResultMap" parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_activity_user 
-	</select>
-
-
-	<select id="listRand" resultMap="BaseResultMap">
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM yeshi_ec_activity_user ORDER BY RAND() LIMIT #{count}
-	</select>
-	
-	<select id="selectByName" resultMap="BaseResultMap" parameterType="java.lang.String">
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM yeshi_ec_activity_user where au_nick_name=#{0}
-	</select>
-	
-	
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_activity_user where au_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_activity_user
-		(au_id,au_nick_name,au_portrait,au_create_time) values
-		(#{id,jdbcType=BIGINT},#{nickName,jdbcType=VARCHAR},#{portrait,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_activity_user
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">au_id,</if>
-			<if test="nickName != null">au_nick_name,</if>
-			<if test="portrait != null">au_portrait,</if>
-			<if test="createTime != null">au_create_time,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="nickName != null">#{nickName,jdbcType=VARCHAR},</if>
-			<if test="portrait != null">#{portrait,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">update
-		yeshi_ec_activity_user set au_nick_name =
-		#{nickName,jdbcType=VARCHAR},au_portrait =
-		#{portrait,jdbcType=VARCHAR},au_create_time =
-		#{createTime,jdbcType=TIMESTAMP} where au_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">
-		update yeshi_ec_activity_user
-		<set>
-			<if test="nickName != null">au_nick_name=#{nickName,jdbcType=VARCHAR},</if>
-			<if test="portrait != null">au_portrait=#{portrait,jdbcType=VARCHAR},</if>
-			<if test="createTime != null">au_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-		</set>
-		where au_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.activity.ActivityUserMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.bus.activity.ActivityUser">
+		<id column="au_id" property="id" jdbcType="BIGINT" />
+		<result column="au_nick_name" property="nickName" jdbcType="VARCHAR" />
+		<result column="au_portrait" property="portrait" jdbcType="VARCHAR" />
+		<result column="au_create_time" property="createTime" jdbcType="TIMESTAMP" />
+	</resultMap>
+	<sql id="Base_Column_List">au_id,au_nick_name,au_portrait,au_create_time</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_activity_user where au_id = #{0}
+	</select>
+
+	<select id="selectList" resultMap="BaseResultMap" parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_activity_user 
+	</select>
+
+
+	<select id="listRand" resultMap="BaseResultMap">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM yeshi_ec_activity_user ORDER BY RAND() LIMIT #{count}
+	</select>
+	
+	<select id="selectByName" resultMap="BaseResultMap" parameterType="java.lang.String">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM yeshi_ec_activity_user where au_nick_name=#{0}
+	</select>
+	
+	
+
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_activity_user where au_id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_activity_user
+		(au_id,au_nick_name,au_portrait,au_create_time) values
+		(#{id,jdbcType=BIGINT},#{nickName,jdbcType=VARCHAR},#{portrait,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_activity_user
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">au_id,</if>
+			<if test="nickName != null">au_nick_name,</if>
+			<if test="portrait != null">au_portrait,</if>
+			<if test="createTime != null">au_create_time,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="nickName != null">#{nickName,jdbcType=VARCHAR},</if>
+			<if test="portrait != null">#{portrait,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">update
+		yeshi_ec_activity_user set au_nick_name =
+		#{nickName,jdbcType=VARCHAR},au_portrait =
+		#{portrait,jdbcType=VARCHAR},au_create_time =
+		#{createTime,jdbcType=TIMESTAMP} where au_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.activity.ActivityUser">
+		update yeshi_ec_activity_user
+		<set>
+			<if test="nickName != null">au_nick_name=#{nickName,jdbcType=VARCHAR},</if>
+			<if test="portrait != null">au_portrait=#{portrait,jdbcType=VARCHAR},</if>
+			<if test="createTime != null">au_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+		</set>
+		where au_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0