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/MaskKeyMapper.xml | 74 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/MaskKeyMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/MaskKeyMapper.xml
index 29f4f83..2cae87c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/MaskKeyMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/MaskKeyMapper.xml
@@ -1,37 +1,37 @@
-<?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.MaskKeyMapper">
- <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.recommend.MaskKey">
- <id column="id" property="id" jdbcType="VARCHAR"/>
- <result column="content" property="content" jdbcType="VARCHAR"/>
- </resultMap>
- <sql id="Base_Column_List">id,content</sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
- <include refid="Base_Column_List"/>from yeshi_ec_mask_key where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_mask_key where id = #{id,jdbcType=BIGINT}</delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_mask_key (id,content) values (#{id,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR})</insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_mask_key
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="content != null">content,</if>
- </trim>values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=VARCHAR},</if>
- <if test="content != null">#{content,jdbcType=VARCHAR},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey">update yeshi_ec_mask_key set content = #{content,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}</update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey">update yeshi_ec_mask_key
- <set>
- <if test="content != null">content=#{content,jdbcType=VARCHAR},</if>
- </set> where id = #{id,jdbcType=VARCHAR}
- </update>
-
- <select id="examineContent" resultType="Integer">
- SELECT COUNT(t.id) FROM `yeshi_ec_mask_key` t
- WHERE INSTR(#{content},t.`content`) <![CDATA[>]]> 0
- </select>
-
-</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.MaskKeyMapper">
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.recommend.MaskKey">
+ <id column="id" property="id" jdbcType="VARCHAR"/>
+ <result column="content" property="content" jdbcType="VARCHAR"/>
+ </resultMap>
+ <sql id="Base_Column_List">id,content</sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+ <include refid="Base_Column_List"/>from yeshi_ec_mask_key where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_mask_key where id = #{id,jdbcType=BIGINT}</delete>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_mask_key (id,content) values (#{id,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR})</insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_mask_key
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="content != null">content,</if>
+ </trim>values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=VARCHAR},</if>
+ <if test="content != null">#{content,jdbcType=VARCHAR},</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey">update yeshi_ec_mask_key set content = #{content,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}</update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.recommend.MaskKey">update yeshi_ec_mask_key
+ <set>
+ <if test="content != null">content=#{content,jdbcType=VARCHAR},</if>
+ </set> where id = #{id,jdbcType=VARCHAR}
+ </update>
+
+ <select id="examineContent" resultType="Integer">
+ SELECT COUNT(t.id) FROM `yeshi_ec_mask_key` t
+ WHERE INSTR(#{content},t.`content`) <![CDATA[>]]> 0
+ </select>
+
+</mapper>
--
Gitblit v1.8.0