Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/mapping/goods/HotSearchMapper.xml

@@ -5,31 +5,35 @@
  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.search.HotSearch">
    <id column="id" property="id" jdbcType="BIGINT"/>
    <result column="orderby" property="orderby" jdbcType="INTEGER"/>
    <result column="useType" property="use_type" jdbcType="INTEGER"/>
    <result column="name" property="name" jdbcType="VARCHAR"/>
  </resultMap>
  <sql id="Base_Column_List">id,`orderby`,`name`</sql>
  <sql id="Base_Column_List">id,`orderby`,`name`,`use_type`</sql>
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
     select <include refid="Base_Column_List"/>from yeshi_ec_hot_search where id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_hot_search where id = #{id,jdbcType=BIGINT}</delete>
  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.search.HotSearch" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_hot_search (id,`orderby`,`name`) values (#{id,jdbcType=BIGINT},#{orderby,jdbcType=INTEGER},#{name,jdbcType=VARCHAR})</insert>
  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.search.HotSearch" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_hot_search (id,`orderby`,`name`,use_type) values (#{id,jdbcType=BIGINT},#{orderby,jdbcType=INTEGER},#{name,jdbcType=VARCHAR},#{useType,jdbcType=INTEGER})</insert>
  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.search.HotSearch" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_hot_search
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">id,</if>
      <if test="orderby != null">`orderby`,</if>
      <if test="name != null">`name`,</if>
      <if test="useType != null">`use_type`,</if>
    </trim>values
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">#{id,jdbcType=BIGINT},</if>
      <if test="orderby != null">#{orderby,jdbcType=INTEGER},</if>
      <if test="name != null">#{name,jdbcType=VARCHAR},</if>
      <if test="useType != null">#{useType,jdbcType=INTEGER},</if>
    </trim>
  </insert>
  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.search.HotSearch">update yeshi_ec_hot_search set `orderby` = #{orderby,jdbcType=INTEGER},`name` = #{name,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT}</update>
  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.search.HotSearch">update yeshi_ec_hot_search set `orderby` = #{orderby,jdbcType=INTEGER},`name` = #{name,jdbcType=VARCHAR},`use_type` = #{useType,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}</update>
  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.search.HotSearch">update yeshi_ec_hot_search
    <set>
      <if test="orderby != null">`orderby`=#{orderby,jdbcType=INTEGER},</if>
      <if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
      <if test="useType != null">`use_type`=#{useType,jdbcType=INTEGER},</if>
    </set> where id = #{id,jdbcType=BIGINT}
  </update>