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/ForbiddenUserIdentifyCodeMapper.xml |  198 ++++++++++++++++++++++++------------------------
 1 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml
index c7460b1..173149e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml
@@ -1,99 +1,99 @@
-<?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.ForbiddenUserIdentifyCodeMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode">
-		<id column="fuc_id" property="id" jdbcType="BIGINT" />
-		<result column="fuc_type" property="type"
-			typeHandler="com.yeshi.fanli.util.mybatishandler.ForbiddenUserIdentifyCodeTypeEnumHandler" />
-		<result column="fuc_uid" property="user" jdbcType="VARCHAR" />
-		<result column="fuc_identify_code" property="identifyCode"
-			jdbcType="VARCHAR" />
-		<result column="fuc_effective" property="effective" jdbcType="BOOLEAN" />
-		<result column="fuc_create_time" property="createTime"
-			jdbcType="TIMESTAMP" />
-		<result column="fuc_update_time" property="updateTime"
-			jdbcType="TIMESTAMP" />
-	</resultMap>
-	
-	<sql id="Base_Column_List">fuc_id,fuc_type,fuc_identify_code,fuc_effective,fuc_create_time,fuc_update_time,fuc_beizhu
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_forbidden_user_identify_code where fuc_id =
-		#{id,jdbcType=BIGINT}
-	</select>
-
-	<select id="listByTypeAndIdentifyCode" resultMap="BaseResultMap">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_forbidden_user_identify_code where fuc_type =
-		#{type} and
-		fuc_identify_code=#{identifyCode}
-	</select>
-
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_forbidden_user_identify_code where fuc_id =
-		#{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert"
-		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_forbidden_user_identify_code
-		(fuc_id,fuc_type,fuc_identify_code,fuc_effective,fuc_create_time,fuc_update_time,fuc_beizhu)
-		values
-		(#{id,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{identifyCode,jdbcType=VARCHAR},#{effective,jdbcType=BOOLEAN},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{beiZhu,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective"
-		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_forbidden_user_identify_code
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">fuc_id,</if>
-			<if test="type != null">fuc_type,</if>
-			<if test="identifyCode != null">fuc_identify_code,</if>
-			<if test="effective != null">fuc_effective,</if>
-			<if test="createTime != null">fuc_create_time,</if>
-			<if test="updateTime != null">fuc_update_time,</if>
-			<if test="beiZhu != null">fuc_beizhu,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="type != null">#{type,jdbcType=VARCHAR},</if>
-			<if test="identifyCode != null">#{identifyCode,jdbcType=VARCHAR},</if>
-			<if test="effective != null">#{effective,jdbcType=BOOLEAN},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
-		</trim>
-	</insert>
-	<update id="updateByPrimaryKey"
-		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode">update yeshi_ec_forbidden_user_identify_code set
-		fuc_type = #{type,jdbcType=VARCHAR},fuc_identify_code =
-		#{identifyCode,jdbcType=VARCHAR},fuc_effective =
-		#{effective,jdbcType=BOOLEAN},fuc_create_time =
-		#{createTime,jdbcType=TIMESTAMP},fuc_update_time =
-		#{updateTime,jdbcType=TIMESTAMP},fuc_beizhu=
-		#{beiZhu,jdbcType=VARCHAR}
-		 where fuc_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective"
-		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode">
-		update yeshi_ec_forbidden_user_identify_code
-		<set>
-			<if test="type != null">fuc_type=#{type,jdbcType=VARCHAR},</if>
-			<if test="identifyCode != null">fuc_identify_code=#{identifyCode,jdbcType=VARCHAR},</if>
-			<if test="effective != null">fuc_effective=#{effective,jdbcType=BOOLEAN},</if>
-			<if test="createTime != null">fuc_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">fuc_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="beiZhu != null">fuc_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
-		</set>
-		where fuc_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.ForbiddenUserIdentifyCodeMapper">
+	<resultMap id="BaseResultMap"
+		type="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode">
+		<id column="fuc_id" property="id" jdbcType="BIGINT" />
+		<result column="fuc_type" property="type"
+			typeHandler="com.yeshi.fanli.util.mybatishandler.ForbiddenUserIdentifyCodeTypeEnumHandler" />
+		<result column="fuc_uid" property="user" jdbcType="VARCHAR" />
+		<result column="fuc_identify_code" property="identifyCode"
+			jdbcType="VARCHAR" />
+		<result column="fuc_effective" property="effective" jdbcType="BOOLEAN" />
+		<result column="fuc_create_time" property="createTime"
+			jdbcType="TIMESTAMP" />
+		<result column="fuc_update_time" property="updateTime"
+			jdbcType="TIMESTAMP" />
+	</resultMap>
+	
+	<sql id="Base_Column_List">fuc_id,fuc_type,fuc_identify_code,fuc_effective,fuc_create_time,fuc_update_time,fuc_beizhu
+	</sql>
+	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
+		parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_forbidden_user_identify_code where fuc_id =
+		#{id,jdbcType=BIGINT}
+	</select>
+
+	<select id="listByTypeAndIdentifyCode" resultMap="BaseResultMap">
+		select
+		<include refid="Base_Column_List" />
+		from yeshi_ec_forbidden_user_identify_code where fuc_type =
+		#{type} and
+		fuc_identify_code=#{identifyCode}
+	</select>
+
+
+	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+		yeshi_ec_forbidden_user_identify_code where fuc_id =
+		#{id,jdbcType=BIGINT}
+	</delete>
+	<insert id="insert"
+		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode"
+		useGeneratedKeys="true" keyProperty="id">insert into
+		yeshi_ec_forbidden_user_identify_code
+		(fuc_id,fuc_type,fuc_identify_code,fuc_effective,fuc_create_time,fuc_update_time,fuc_beizhu)
+		values
+		(#{id,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{identifyCode,jdbcType=VARCHAR},#{effective,jdbcType=BOOLEAN},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{beiZhu,jdbcType=VARCHAR})
+	</insert>
+	<insert id="insertSelective"
+		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into yeshi_ec_forbidden_user_identify_code
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">fuc_id,</if>
+			<if test="type != null">fuc_type,</if>
+			<if test="identifyCode != null">fuc_identify_code,</if>
+			<if test="effective != null">fuc_effective,</if>
+			<if test="createTime != null">fuc_create_time,</if>
+			<if test="updateTime != null">fuc_update_time,</if>
+			<if test="beiZhu != null">fuc_beizhu,</if>
+		</trim>
+		values
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id,jdbcType=BIGINT},</if>
+			<if test="type != null">#{type,jdbcType=VARCHAR},</if>
+			<if test="identifyCode != null">#{identifyCode,jdbcType=VARCHAR},</if>
+			<if test="effective != null">#{effective,jdbcType=BOOLEAN},</if>
+			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="beiZhu != null">#{beiZhu,jdbcType=VARCHAR},</if>
+		</trim>
+	</insert>
+	<update id="updateByPrimaryKey"
+		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode">update yeshi_ec_forbidden_user_identify_code set
+		fuc_type = #{type,jdbcType=VARCHAR},fuc_identify_code =
+		#{identifyCode,jdbcType=VARCHAR},fuc_effective =
+		#{effective,jdbcType=BOOLEAN},fuc_create_time =
+		#{createTime,jdbcType=TIMESTAMP},fuc_update_time =
+		#{updateTime,jdbcType=TIMESTAMP},fuc_beizhu=
+		#{beiZhu,jdbcType=VARCHAR}
+		 where fuc_id = #{id,jdbcType=BIGINT}
+	</update>
+	<update id="updateByPrimaryKeySelective"
+		parameterType="com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode">
+		update yeshi_ec_forbidden_user_identify_code
+		<set>
+			<if test="type != null">fuc_type=#{type,jdbcType=VARCHAR},</if>
+			<if test="identifyCode != null">fuc_identify_code=#{identifyCode,jdbcType=VARCHAR},</if>
+			<if test="effective != null">fuc_effective=#{effective,jdbcType=BOOLEAN},</if>
+			<if test="createTime != null">fuc_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+			<if test="updateTime != null">fuc_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+			<if test="beiZhu != null">fuc_beizhu=#{beiZhu,jdbcType=VARCHAR},</if>
+		</set>
+		where fuc_id = #{id,jdbcType=BIGINT}
+	</update>
+</mapper>

--
Gitblit v1.8.0