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/BusinessSystemMapper.xml |  180 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/BusinessSystemMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/BusinessSystemMapper.xml
index 7b861a8..5e24494 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/BusinessSystemMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/BusinessSystemMapper.xml
@@ -1,90 +1,90 @@
-<?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.BusinessSystemMapper">
-	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.BusinessSystem">
-		<id column="id" property="id" jdbcType="BIGINT" />
-		<result column="name" property="name" jdbcType="VARCHAR" />
-		<result column="platform" property="platform" jdbcType="INTEGER" />
-		<result column="createtime" property="createtime" jdbcType="BIGINT" />
-		<result column="beizhu" property="beizhu" jdbcType="VARCHAR" />
-		<result column="package_name" property="packageName" jdbcType="VARCHAR" />
-		<result column="appid" property="appid" jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="Base_Column_List">id,name,platform,createtime,beizhu,package_name,appid</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_system where id = #{id,jdbcType=BIGINT}
-	</select>
-
-
-	<select id="listAll" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_system
-	</select>
-
-
-	<select id="listByPlatformAndPackage" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_system where platform=#{platform} and
-		package_name=#{packageName}
-	</select>
-
-
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_system where id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.system.BusinessSystem"
-		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system
-		(id,name,platform,createtime,beizhu,package_name,appid) values
-		(#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{platform,jdbcType=INTEGER},#{createtime,jdbcType=BIGINT},#{beizhu,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{appid,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_system
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">id,</if>
-			<if test="name != null">name,</if>
-			<if test="platform != null">platform,</if>
-			<if test="createtime != null">createtime,</if>
-			<if test="beizhu != null">beizhu,</if>
-			<if test="packageName != null">package_name,</if>
-			<if test="appid != null">appid,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
-			<if test="platform != null">#{platform,jdbcType=INTEGER},</if>
-			<if test="createtime != null">#{createtime,jdbcType=BIGINT},</if>
-			<if test="beizhu != null">#{beizhu,jdbcType=VARCHAR},</if>
-			<if test="packageName != null">#{packageName,jdbcType=VARCHAR},</if>
-			<if test="appid != null">#{appid,jdbcType=VARCHAR},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.BusinessSystem">update
-		yeshi_ec_system set name = #{name,jdbcType=VARCHAR},platform =
-		#{platform,jdbcType=INTEGER},createtime =
-		#{createtime,jdbcType=BIGINT},beizhu =
-		#{beizhu,jdbcType=VARCHAR},package_name =
-		#{packageName,jdbcType=VARCHAR},appid = #{appid,jdbcType=VARCHAR}
-		where id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem">
-		update yeshi_ec_system
-		<set>
-			<if test="name != null">name=#{name,jdbcType=VARCHAR},</if>
-			<if test="platform != null">platform=#{platform,jdbcType=INTEGER},</if>
-			<if test="createtime != null">createtime=#{createtime,jdbcType=BIGINT},</if>
-			<if test="beizhu != null">beizhu=#{beizhu,jdbcType=VARCHAR},</if>
-			<if test="packageName != null">package_name=#{packageName,jdbcType=VARCHAR},</if>
-			<if test="appid != null">appid=#{appid,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.BusinessSystemMapper">
+	<resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.BusinessSystem">
+		<id column="id" property="id" jdbcType="BIGINT" />
+		<result column="name" property="name" jdbcType="VARCHAR" />
+		<result column="platform" property="platform" jdbcType="INTEGER" />
+		<result column="createtime" property="createtime" jdbcType="BIGINT" />
+		<result column="beizhu" property="beizhu" jdbcType="VARCHAR" />
+		<result column="package_name" property="packageName" jdbcType="VARCHAR" />
+		<result column="appid" property="appid" jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="Base_Column_List">id,name,platform,createtime,beizhu,package_name,appid</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_system where id = #{id,jdbcType=BIGINT}
+	</select>
+
+
+	<select id="listAll" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_system
+	</select>
+
+
+	<select id="listByPlatformAndPackage" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_system where platform=#{platform} and
+		package_name=#{packageName}
+	</select>
+
+
+
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_system where id = #{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert" parameterType="com.yeshi.fanli.entity.system.BusinessSystem"
+		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system
+		(id,name,platform,createtime,beizhu,package_name,appid) values
+		(#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{platform,jdbcType=INTEGER},#{createtime,jdbcType=BIGINT},#{beizhu,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{appid,jdbcType=VARCHAR})
+	</insert>
+	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_system
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="name != null">name,</if>
+			<if test="platform != null">platform,</if>
+			<if test="createtime != null">createtime,</if>
+			<if test="beizhu != null">beizhu,</if>
+			<if test="packageName != null">package_name,</if>
+			<if test="appid != null">appid,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="name != null">#{name,jdbcType=VARCHAR},</if>
+			<if test="platform != null">#{platform,jdbcType=INTEGER},</if>
+			<if test="createtime != null">#{createtime,jdbcType=BIGINT},</if>
+			<if test="beizhu != null">#{beizhu,jdbcType=VARCHAR},</if>
+			<if test="packageName != null">#{packageName,jdbcType=VARCHAR},</if>
+			<if test="appid != null">#{appid,jdbcType=VARCHAR},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.BusinessSystem">update
+		yeshi_ec_system set name = #{name,jdbcType=VARCHAR},platform =
+		#{platform,jdbcType=INTEGER},createtime =
+		#{createtime,jdbcType=BIGINT},beizhu =
+		#{beizhu,jdbcType=VARCHAR},package_name =
+		#{packageName,jdbcType=VARCHAR},appid = #{appid,jdbcType=VARCHAR}
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem">
+		update yeshi_ec_system
+		<set>
+			<if test="name != null">name=#{name,jdbcType=VARCHAR},</if>
+			<if test="platform != null">platform=#{platform,jdbcType=INTEGER},</if>
+			<if test="createtime != null">createtime=#{createtime,jdbcType=BIGINT},</if>
+			<if test="beizhu != null">beizhu=#{beizhu,jdbcType=VARCHAR},</if>
+			<if test="packageName != null">package_name=#{packageName,jdbcType=VARCHAR},</if>
+			<if test="appid != null">appid=#{appid,jdbcType=VARCHAR},</if>
+		</set>
+		where id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0