From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 14 三月 2019 16:14:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/mapping/SystemMapper.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/SystemMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/SystemMapper.xml index 4f66054..9642ef5 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/SystemMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/SystemMapper.xml @@ -1,8 +1,8 @@ <?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.SystemMapper"> - <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.System"> +<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" /> @@ -21,12 +21,12 @@ <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.System" + <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.System" + <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem" useGeneratedKeys="true" keyProperty="id"> insert into yeshi_ec_system <trim prefix="(" suffix=")" suffixOverrides=","> @@ -49,7 +49,7 @@ <if test="appid != null">#{appid,jdbcType=VARCHAR},</if> </trim> </insert> - <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.System">update + <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 = @@ -57,7 +57,7 @@ #{packageName,jdbcType=VARCHAR},appid = #{appid,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} </update> - <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.System"> + <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem"> update yeshi_ec_system <set> <if test="name != null">name=#{name,jdbcType=VARCHAR},</if> -- Gitblit v1.8.0