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/ConfigMapper.xml |  244 ++++++++++++++++++++++++------------------------
 1 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml
index 12f2782..5e89050 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ConfigMapper.xml
@@ -1,122 +1,122 @@
-<?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.ConfigMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.common.Config">
-		<id column="id" property="id" jdbcType="BIGINT" />
-		<result column="`key`" property="key" jdbcType="VARCHAR" />
-		<result column="`value`" property="value" jdbcType="VARCHAR" />
-		<result column="`name`" property="name" jdbcType="VARCHAR" />
-		<result column="beizhu" property="beizhu" jdbcType="VARCHAR" />
-		<result column="createtime" property="createtime" jdbcType="VARCHAR" />
-		<result column="min_android_version" property="minAndroidVersionCode"
-			jdbcType="INTEGER" />
-		<result column="min_ios_version" property="minIosVersionCode"
-			jdbcType="INTEGER" />
-	</resultMap>
-	<sql id="Base_Column_List">`id`,`key`,`value`,`name`,beizhu,createtime,min_android_version,min_ios_version
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_config where id = #{id,jdbcType=BIGINT}
-	</select>
-	<select id="selectByKey" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_config where `key` = #{0} limit 1
-	</select>
-	<select id="listAll" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_config
-	</select>
-	<select id="listSearchByName" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_config where `name` like '%${key}%' limit
-		#{start},#{count}
-	</select>
-	<select id="countSearchByName" resultType="java.lang.Long"
-		parameterType="java.lang.String">select count(*) from yeshi_ec_config where `name` like
-		'%${key}%'</select>
-
-	<select id="listByKey" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_config where `key`=#{key}
-		<if test="minAndroidVersion!=null">
-			and #{minAndroidVersion} >= min_android_version
-			order by min_android_version desc
-		</if>
-		<if test="minIosVersion!=null">
-			and #{minIosVersion} >= min_ios_version
-			order by min_ios_version desc
-		</if>
-	</select>
-
-
-
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_config where id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.common.Config"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_config
-		(id,key,value,name,beizhu,createtime,min_android_version,min_ios_version)
-		values
-		(#{id,jdbcType=BIGINT},#{key,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{beizhu,jdbcType=VARCHAR},#{createtime,jdbcType=VARCHAR},#{minAndroidVersionCode,jdbcType=INTEGER},#{minIosVersionCode,jdbcType=INTEGER})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.common.Config"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_config
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">id,</if>
-			<if test="key != null">`key`,</if>
-			<if test="value != null">`value`,</if>
-			<if test="name != null">`name`,</if>
-			<if test="beizhu != null">beizhu,</if>
-			<if test="createtime != null">createtime,</if>
-			<if test="minAndroidVersionCode != null">min_android_version,</if>
-			<if test="minIosVersionCode != null">min_ios_version,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="key != null">#{key,jdbcType=VARCHAR},</if>
-			<if test="value != null">#{value,jdbcType=VARCHAR},</if>
-			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
-			<if test="beizhu != null">#{beizhu,jdbcType=VARCHAR},</if>
-			<if test="createtime != null">#{createtime,jdbcType=VARCHAR},</if>
-			<if test="minAndroidVersionCode != null">#{minAndroidVersionCode,jdbcType=INTEGER},</if>
-			<if test="minIosVersionCode != null">#{minIosVersionCode,jdbcType=INTEGER}</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.common.Config">update
-		yeshi_ec_config set `key` = #{key,jdbcType=VARCHAR},`value` =
-		#{value,jdbcType=VARCHAR},`name` = #{name,jdbcType=VARCHAR},beizhu =
-		#{beizhu,jdbcType=VARCHAR},createtime = #{createtime,jdbcType=VARCHAR}
-		,min_android_version =#{minAndroidVersionCode,jdbcType=INTEGER}
-		,min_ios_version =#{minIosVersionCode,jdbcType=INTEGER} where id =
-		#{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.common.Config">
-		update yeshi_ec_config
-		<set>
-			<if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
-			<if test="value != null">`value`=#{value,jdbcType=VARCHAR},</if>
-			<if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
-			<if test="beizhu != null">beizhu=#{beizhu,jdbcType=VARCHAR},</if>
-			<if test="createtime != null">createtime=#{createtime,jdbcType=VARCHAR},</if>
-			<if test="minAndroidVersionCode !=null">min_android_version
-				=#{minAndroidVersionCode,jdbcType=INTEGER},
-			</if>
-			<if test="minIosVersionCode !=null">min_ios_version =#{minIosVersionCode,jdbcType=INTEGER},
-			</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.ConfigMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.common.Config">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="`key`" property="key" jdbcType="VARCHAR" />
+		<result column="`value`" property="value" jdbcType="VARCHAR" />
+		<result column="`name`" property="name" jdbcType="VARCHAR" />
+		<result column="beizhu" property="beizhu" jdbcType="VARCHAR" />
+		<result column="createtime" property="createtime" jdbcType="VARCHAR" />
+		<result column="min_android_version" property="minAndroidVersionCode"
+			jdbcType="INTEGER" />
+		<result column="min_ios_version" property="minIosVersionCode"
+			jdbcType="INTEGER" />
+	</resultMap>
+	<sql id="Base_Column_List">`id`,`key`,`value`,`name`,beizhu,createtime,min_android_version,min_ios_version
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_config where id = #{id,jdbcType=BIGINT}
+	</select>
+	<select id="selectByKey" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_config where `key` = #{0} limit 1
+	</select>
+	<select id="listAll" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_config
+	</select>
+	<select id="listSearchByName" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_config where `name` like '%${key}%' limit
+		#{start},#{count}
+	</select>
+	<select id="countSearchByName" resultType="java.lang.Long"
+		parameterType="java.lang.String">select count(*) from yeshi_ec_config where `name` like
+		'%${key}%'</select>
+
+	<select id="listByKey" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_config where `key`=#{key}
+		<if test="minAndroidVersion!=null">
+			and #{minAndroidVersion} >= min_android_version
+			order by min_android_version desc
+		</if>
+		<if test="minIosVersion!=null">
+			and #{minIosVersion} >= min_ios_version
+			order by min_ios_version desc
+		</if>
+	</select>
+
+
+
+
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_config where id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.common.Config"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_config
+		(id,key,value,name,beizhu,createtime,min_android_version,min_ios_version)
+		values
+		(#{id,jdbcType=BIGINT},#{key,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{beizhu,jdbcType=VARCHAR},#{createtime,jdbcType=VARCHAR},#{minAndroidVersionCode,jdbcType=INTEGER},#{minIosVersionCode,jdbcType=INTEGER})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.common.Config"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_config
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="key != null">`key`,</if>
+			<if test="value != null">`value`,</if>
+			<if test="name != null">`name`,</if>
+			<if test="beizhu != null">beizhu,</if>
+			<if test="createtime != null">createtime,</if>
+			<if test="minAndroidVersionCode != null">min_android_version,</if>
+			<if test="minIosVersionCode != null">min_ios_version,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="key != null">#{key,jdbcType=VARCHAR},</if>
+			<if test="value != null">#{value,jdbcType=VARCHAR},</if>
+			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
+			<if test="beizhu != null">#{beizhu,jdbcType=VARCHAR},</if>
+			<if test="createtime != null">#{createtime,jdbcType=VARCHAR},</if>
+			<if test="minAndroidVersionCode != null">#{minAndroidVersionCode,jdbcType=INTEGER},</if>
+			<if test="minIosVersionCode != null">#{minIosVersionCode,jdbcType=INTEGER}</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.common.Config">update
+		yeshi_ec_config set `key` = #{key,jdbcType=VARCHAR},`value` =
+		#{value,jdbcType=VARCHAR},`name` = #{name,jdbcType=VARCHAR},beizhu =
+		#{beizhu,jdbcType=VARCHAR},createtime = #{createtime,jdbcType=VARCHAR}
+		,min_android_version =#{minAndroidVersionCode,jdbcType=INTEGER}
+		,min_ios_version =#{minIosVersionCode,jdbcType=INTEGER} where id =
+		#{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.common.Config">
+		update yeshi_ec_config
+		<set>
+			<if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
+			<if test="value != null">`value`=#{value,jdbcType=VARCHAR},</if>
+			<if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
+			<if test="beizhu != null">beizhu=#{beizhu,jdbcType=VARCHAR},</if>
+			<if test="createtime != null">createtime=#{createtime,jdbcType=VARCHAR},</if>
+			<if test="minAndroidVersionCode !=null">min_android_version
+				=#{minAndroidVersionCode,jdbcType=INTEGER},
+			</if>
+			<if test="minIosVersionCode !=null">min_ios_version =#{minIosVersionCode,jdbcType=INTEGER},
+			</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0