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/StrategyPictureMapper.xml |  156 ++++++++++++++++++++++++++--------------------------
 1 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/StrategyPictureMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/StrategyPictureMapper.xml
index 3719206..a0a2fad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/StrategyPictureMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/StrategyPictureMapper.xml
@@ -1,78 +1,78 @@
-<?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.StrategyPictureMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.xcx.StrategyPicture">
-		<id column="id" property="id" jdbcType="BIGINT" />
-		<result column="strategyPicture" property="strategyPicture"
-			jdbcType="VARCHAR" />
-		<result column="post_picture" property="postPicture" jdbcType="VARCHAR" />
-		<result column="title" property="title" jdbcType="VARCHAR" />
-		<result column="orderBy" property="orderBy" jdbcType="INTEGER" />
-		<result column="type" property="type" jdbcType="INTEGER" />
-		<result column="video_url" property="videoUrl" jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="Base_Column_List">id,strategyPicture,post_picture,title,orderBy,type,video_url
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from ye_yeshi_strategy_picture where id = #{id,jdbcType=BIGINT}
-	</select>
-	<select id="selectStrategyPictureList" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from ye_yeshi_strategy_picture order by orderBy desc
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		ye_yeshi_strategy_picture where id = #{id,jdbcType=BIGINT}</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		ye_yeshi_strategy_picture
-		(id,strategyPicture,post_picture,title,orderBy,type,video_url) values
-		(#{id,jdbcType=BIGINT},#{strategyPicture,jdbcType=VARCHAR},#{postPicture,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{orderBy,jdbcType=INTEGER},#{type,jdbcType=INTEGER},#{videoUrl,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into ye_yeshi_strategy_picture
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">id,</if>
-			<if test="strategyPicture != null">strategyPicture,</if>
-			<if test="postPicture != null">post_picture,</if>
-			<if test="title != null">title,</if>
-			<if test="orderBy != null">orderBy,</if>
-			<if test="type != null">type,</if>
-			<if test="videoUrl != null">video_url,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="strategyPicture != null">#{strategyPicture,jdbcType=VARCHAR},</if>
-			<if test="postPicture != null">#{postPicture,jdbcType=VARCHAR},</if>
-			<if test="title != null">#{title,jdbcType=VARCHAR},</if>
-			<if test="orderBy != null">#{orderBy,jdbcType=INTEGER},</if>
-			<if test="type != null">#{type,jdbcType=INTEGER},</if>
-			<if test="videoUrl != null">#{videoUrl,jdbcType=VARCHAR}</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture">update
-		ye_yeshi_strategy_picture set strategyPicture =
-		#{strategyPicture,jdbcType=VARCHAR},post_picture =
-		#{postPicture,jdbcType=VARCHAR},title =
-		#{title,jdbcType=VARCHAR},orderBy = #{orderBy,jdbcType=INTEGER} ,type
-		=#{type,jdbcType=INTEGER} ,video_url =#{videoUrl,jdbcType=VARCHAR}
-		where id = #{id,jdbcType=BIGINT}</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture">
-		update ye_yeshi_strategy_picture
-		<set>
-			<if test="strategyPicture != null">strategyPicture=#{strategyPicture,jdbcType=VARCHAR},</if>
-			<if test="postPicture != null">post_picture=#{postPicture,jdbcType=VARCHAR},</if>
-			<if test="title != null">title=#{title,jdbcType=VARCHAR},</if>
-			<if test="orderBy != null">orderBy=#{orderBy,jdbcType=INTEGER},</if>
-			<if test="type !=null">type =#{type,jdbcType=INTEGER},</if>
-			<if test="videoUrl !=null">video_url =#{videoUrl,jdbcType=VARCHAR},</if>
-		</set>
-		where 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.StrategyPictureMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.xcx.StrategyPicture">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="strategyPicture" property="strategyPicture"
+			jdbcType="VARCHAR" />
+		<result column="post_picture" property="postPicture" jdbcType="VARCHAR" />
+		<result column="title" property="title" jdbcType="VARCHAR" />
+		<result column="orderBy" property="orderBy" jdbcType="INTEGER" />
+		<result column="type" property="type" jdbcType="INTEGER" />
+		<result column="video_url" property="videoUrl" jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">id,strategyPicture,post_picture,title,orderBy,type,video_url
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from ye_yeshi_strategy_picture where id = #{id,jdbcType=BIGINT}
+	</select>
+	<select id="selectStrategyPictureList" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from ye_yeshi_strategy_picture order by orderBy desc
+	</select>
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		ye_yeshi_strategy_picture where id = #{id,jdbcType=BIGINT}</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		ye_yeshi_strategy_picture
+		(id,strategyPicture,post_picture,title,orderBy,type,video_url) values
+		(#{id,jdbcType=BIGINT},#{strategyPicture,jdbcType=VARCHAR},#{postPicture,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{orderBy,jdbcType=INTEGER},#{type,jdbcType=INTEGER},#{videoUrl,jdbcType=VARCHAR})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into ye_yeshi_strategy_picture
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="strategyPicture != null">strategyPicture,</if>
+			<if test="postPicture != null">post_picture,</if>
+			<if test="title != null">title,</if>
+			<if test="orderBy != null">orderBy,</if>
+			<if test="type != null">type,</if>
+			<if test="videoUrl != null">video_url,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="strategyPicture != null">#{strategyPicture,jdbcType=VARCHAR},</if>
+			<if test="postPicture != null">#{postPicture,jdbcType=VARCHAR},</if>
+			<if test="title != null">#{title,jdbcType=VARCHAR},</if>
+			<if test="orderBy != null">#{orderBy,jdbcType=INTEGER},</if>
+			<if test="type != null">#{type,jdbcType=INTEGER},</if>
+			<if test="videoUrl != null">#{videoUrl,jdbcType=VARCHAR}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture">update
+		ye_yeshi_strategy_picture set strategyPicture =
+		#{strategyPicture,jdbcType=VARCHAR},post_picture =
+		#{postPicture,jdbcType=VARCHAR},title =
+		#{title,jdbcType=VARCHAR},orderBy = #{orderBy,jdbcType=INTEGER} ,type
+		=#{type,jdbcType=INTEGER} ,video_url =#{videoUrl,jdbcType=VARCHAR}
+		where id = #{id,jdbcType=BIGINT}</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.xcx.StrategyPicture">
+		update ye_yeshi_strategy_picture
+		<set>
+			<if test="strategyPicture != null">strategyPicture=#{strategyPicture,jdbcType=VARCHAR},</if>
+			<if test="postPicture != null">post_picture=#{postPicture,jdbcType=VARCHAR},</if>
+			<if test="title != null">title=#{title,jdbcType=VARCHAR},</if>
+			<if test="orderBy != null">orderBy=#{orderBy,jdbcType=INTEGER},</if>
+			<if test="type !=null">type =#{type,jdbcType=INTEGER},</if>
+			<if test="videoUrl !=null">video_url =#{videoUrl,jdbcType=VARCHAR},</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0