修复bug以及去除多余代码

forest-admin/admin-mbg/src/main/resources/mapper/CmsHelpCategoryMapper.xml

@@ -1,226 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsHelpCategoryMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsHelpCategory">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="help_count" jdbcType="INTEGER" property="helpCount" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, icon, help_count, show_status, sort
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsHelpCategoryExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_help_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from cms_help_category
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_help_category
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsHelpCategoryExample">
-    delete from cms_help_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsHelpCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_help_category (name, icon, help_count, 
-      show_status, sort)
-    values (#{name,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{helpCount,jdbcType=INTEGER}, 
-      #{showStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsHelpCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_help_category
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="helpCount != null">
-        help_count,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="helpCount != null">
-        #{helpCount,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsHelpCategoryExample" resultType="java.lang.Long">
-    select count(*) from cms_help_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_help_category
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.helpCount != null">
-        help_count = #{record.helpCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_help_category
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      help_count = #{record.helpCount,jdbcType=INTEGER},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsHelpCategory">
-    update cms_help_category
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="helpCount != null">
-        help_count = #{helpCount,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsHelpCategory">
-    update cms_help_category
-    set name = #{name,jdbcType=VARCHAR},
-      icon = #{icon,jdbcType=VARCHAR},
-      help_count = #{helpCount,jdbcType=INTEGER},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsHelpMapper.xml

@@ -1,304 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsHelpMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsHelp">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="category_id" jdbcType="BIGINT" property="categoryId" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="read_count" jdbcType="INTEGER" property="readCount" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.CmsHelp">
-    <result column="content" jdbcType="LONGVARCHAR" property="content" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, category_id, icon, title, show_status, create_time, read_count
-  </sql>
-  <sql id="Blob_Column_List">
-    content
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsHelpExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_help
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsHelpExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_help
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_help
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_help
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsHelpExample">
-    delete from cms_help
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsHelp">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_help (category_id, icon, title, 
-      show_status, create_time, read_count, 
-      content)
-    values (#{categoryId,jdbcType=BIGINT}, #{icon,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
-      #{showStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{readCount,jdbcType=INTEGER}, 
-      #{content,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsHelp">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_help
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="categoryId != null">
-        category_id,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="readCount != null">
-        read_count,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="categoryId != null">
-        #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="readCount != null">
-        #{readCount,jdbcType=INTEGER},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsHelpExample" resultType="java.lang.Long">
-    select count(*) from cms_help
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_help
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.categoryId != null">
-        category_id = #{record.categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.readCount != null">
-        read_count = #{record.readCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update cms_help
-    set id = #{record.id,jdbcType=BIGINT},
-      category_id = #{record.categoryId,jdbcType=BIGINT},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      title = #{record.title,jdbcType=VARCHAR},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      read_count = #{record.readCount,jdbcType=INTEGER},
-      content = #{record.content,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_help
-    set id = #{record.id,jdbcType=BIGINT},
-      category_id = #{record.categoryId,jdbcType=BIGINT},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      title = #{record.title,jdbcType=VARCHAR},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      read_count = #{record.readCount,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsHelp">
-    update cms_help
-    <set>
-      <if test="categoryId != null">
-        category_id = #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="readCount != null">
-        read_count = #{readCount,jdbcType=INTEGER},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsHelp">
-    update cms_help
-    set category_id = #{categoryId,jdbcType=BIGINT},
-      icon = #{icon,jdbcType=VARCHAR},
-      title = #{title,jdbcType=VARCHAR},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      read_count = #{readCount,jdbcType=INTEGER},
-      content = #{content,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsHelp">
-    update cms_help
-    set category_id = #{categoryId,jdbcType=BIGINT},
-      icon = #{icon,jdbcType=VARCHAR},
-      title = #{title,jdbcType=VARCHAR},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      read_count = #{readCount,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsMemberReportMapper.xml

@@ -1,211 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsMemberReportMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsMemberReport">
-    <result column="id" jdbcType="BIGINT" property="id" />
-    <result column="report_type" jdbcType="INTEGER" property="reportType" />
-    <result column="report_member_name" jdbcType="VARCHAR" property="reportMemberName" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="report_object" jdbcType="VARCHAR" property="reportObject" />
-    <result column="report_status" jdbcType="INTEGER" property="reportStatus" />
-    <result column="handle_status" jdbcType="INTEGER" property="handleStatus" />
-    <result column="note" jdbcType="VARCHAR" property="note" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, report_type, report_member_name, create_time, report_object, report_status, handle_status, 
-    note
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsMemberReportExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_member_report
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsMemberReportExample">
-    delete from cms_member_report
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsMemberReport">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_member_report (report_type, report_member_name, create_time, 
-      report_object, report_status, handle_status, 
-      note)
-    values (#{reportType,jdbcType=INTEGER}, #{reportMemberName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{reportObject,jdbcType=VARCHAR}, #{reportStatus,jdbcType=INTEGER}, #{handleStatus,jdbcType=INTEGER}, 
-      #{note,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsMemberReport">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_member_report
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="reportType != null">
-        report_type,
-      </if>
-      <if test="reportMemberName != null">
-        report_member_name,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="reportObject != null">
-        report_object,
-      </if>
-      <if test="reportStatus != null">
-        report_status,
-      </if>
-      <if test="handleStatus != null">
-        handle_status,
-      </if>
-      <if test="note != null">
-        note,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="reportType != null">
-        #{reportType,jdbcType=INTEGER},
-      </if>
-      <if test="reportMemberName != null">
-        #{reportMemberName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reportObject != null">
-        #{reportObject,jdbcType=VARCHAR},
-      </if>
-      <if test="reportStatus != null">
-        #{reportStatus,jdbcType=INTEGER},
-      </if>
-      <if test="handleStatus != null">
-        #{handleStatus,jdbcType=INTEGER},
-      </if>
-      <if test="note != null">
-        #{note,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsMemberReportExample" resultType="java.lang.Long">
-    select count(*) from cms_member_report
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_member_report
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.reportType != null">
-        report_type = #{record.reportType,jdbcType=INTEGER},
-      </if>
-      <if test="record.reportMemberName != null">
-        report_member_name = #{record.reportMemberName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.reportObject != null">
-        report_object = #{record.reportObject,jdbcType=VARCHAR},
-      </if>
-      <if test="record.reportStatus != null">
-        report_status = #{record.reportStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.handleStatus != null">
-        handle_status = #{record.handleStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.note != null">
-        note = #{record.note,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_member_report
-    set id = #{record.id,jdbcType=BIGINT},
-      report_type = #{record.reportType,jdbcType=INTEGER},
-      report_member_name = #{record.reportMemberName,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      report_object = #{record.reportObject,jdbcType=VARCHAR},
-      report_status = #{record.reportStatus,jdbcType=INTEGER},
-      handle_status = #{record.handleStatus,jdbcType=INTEGER},
-      note = #{record.note,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsPrefrenceAreaMapper.xml

@@ -1,268 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsPrefrenceAreaMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsPrefrenceArea">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="sub_title" jdbcType="VARCHAR" property="subTitle" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.CmsPrefrenceArea">
-    <result column="pic" jdbcType="VARBINARY" property="pic" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, sub_title, sort, show_status
-  </sql>
-  <sql id="Blob_Column_List">
-    pic
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_prefrence_area
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_prefrence_area
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_prefrence_area
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_prefrence_area
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaExample">
-    delete from cms_prefrence_area
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceArea">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_prefrence_area (name, sub_title, sort, 
-      show_status, pic)
-    values (#{name,jdbcType=VARCHAR}, #{subTitle,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
-      #{showStatus,jdbcType=INTEGER}, #{pic,jdbcType=VARBINARY})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceArea">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_prefrence_area
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="subTitle != null">
-        sub_title,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-      <if test="pic != null">
-        pic,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="subTitle != null">
-        #{subTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="pic != null">
-        #{pic,jdbcType=VARBINARY},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaExample" resultType="java.lang.Long">
-    select count(*) from cms_prefrence_area
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_prefrence_area
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subTitle != null">
-        sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.pic != null">
-        pic = #{record.pic,jdbcType=VARBINARY},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update cms_prefrence_area
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      sort = #{record.sort,jdbcType=INTEGER},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      pic = #{record.pic,jdbcType=VARBINARY}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_prefrence_area
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      sort = #{record.sort,jdbcType=INTEGER},
-      show_status = #{record.showStatus,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceArea">
-    update cms_prefrence_area
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="subTitle != null">
-        sub_title = #{subTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="pic != null">
-        pic = #{pic,jdbcType=VARBINARY},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceArea">
-    update cms_prefrence_area
-    set name = #{name,jdbcType=VARCHAR},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      pic = #{pic,jdbcType=VARBINARY}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceArea">
-    update cms_prefrence_area
-    set name = #{name,jdbcType=VARCHAR},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER},
-      show_status = #{showStatus,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsPrefrenceAreaProductRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsPrefrenceAreaProductRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="prefrence_area_id" jdbcType="BIGINT" property="prefrenceAreaId" />
-    <result column="product_id" jdbcType="BIGINT" property="productId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, prefrence_area_id, product_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_prefrence_area_product_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from cms_prefrence_area_product_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_prefrence_area_product_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelationExample">
-    delete from cms_prefrence_area_product_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_prefrence_area_product_relation (prefrence_area_id, product_id)
-    values (#{prefrenceAreaId,jdbcType=BIGINT}, #{productId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_prefrence_area_product_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="prefrenceAreaId != null">
-        prefrence_area_id,
-      </if>
-      <if test="productId != null">
-        product_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="prefrenceAreaId != null">
-        #{prefrenceAreaId,jdbcType=BIGINT},
-      </if>
-      <if test="productId != null">
-        #{productId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelationExample" resultType="java.lang.Long">
-    select count(*) from cms_prefrence_area_product_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_prefrence_area_product_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.prefrenceAreaId != null">
-        prefrence_area_id = #{record.prefrenceAreaId,jdbcType=BIGINT},
-      </if>
-      <if test="record.productId != null">
-        product_id = #{record.productId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_prefrence_area_product_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      prefrence_area_id = #{record.prefrenceAreaId,jdbcType=BIGINT},
-      product_id = #{record.productId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelation">
-    update cms_prefrence_area_product_relation
-    <set>
-      <if test="prefrenceAreaId != null">
-        prefrence_area_id = #{prefrenceAreaId,jdbcType=BIGINT},
-      </if>
-      <if test="productId != null">
-        product_id = #{productId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsPrefrenceAreaProductRelation">
-    update cms_prefrence_area_product_relation
-    set prefrence_area_id = #{prefrenceAreaId,jdbcType=BIGINT},
-      product_id = #{productId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsSubjectCategoryMapper.xml

@@ -1,226 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsSubjectCategoryMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsSubjectCategory">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="subject_count" jdbcType="INTEGER" property="subjectCount" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, icon, subject_count, show_status, sort
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCategoryExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_subject_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from cms_subject_category
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_subject_category
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCategoryExample">
-    delete from cms_subject_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject_category (name, icon, subject_count, 
-      show_status, sort)
-    values (#{name,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{subjectCount,jdbcType=INTEGER}, 
-      #{showStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject_category
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="subjectCount != null">
-        subject_count,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="subjectCount != null">
-        #{subjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCategoryExample" resultType="java.lang.Long">
-    select count(*) from cms_subject_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_subject_category
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subjectCount != null">
-        subject_count = #{record.subjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_subject_category
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      subject_count = #{record.subjectCount,jdbcType=INTEGER},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCategory">
-    update cms_subject_category
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="subjectCount != null">
-        subject_count = #{subjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCategory">
-    update cms_subject_category
-    set name = #{name,jdbcType=VARCHAR},
-      icon = #{icon,jdbcType=VARCHAR},
-      subject_count = #{subjectCount,jdbcType=INTEGER},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsSubjectCommentMapper.xml

@@ -1,243 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsSubjectCommentMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsSubjectComment">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="subject_id" jdbcType="BIGINT" property="subjectId" />
-    <result column="member_nick_name" jdbcType="VARCHAR" property="memberNickName" />
-    <result column="member_icon" jdbcType="VARCHAR" property="memberIcon" />
-    <result column="content" jdbcType="VARCHAR" property="content" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, subject_id, member_nick_name, member_icon, content, create_time, show_status
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCommentExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_subject_comment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from cms_subject_comment
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_subject_comment
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCommentExample">
-    delete from cms_subject_comment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsSubjectComment">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject_comment (subject_id, member_nick_name, member_icon, 
-      content, create_time, show_status
-      )
-    values (#{subjectId,jdbcType=BIGINT}, #{memberNickName,jdbcType=VARCHAR}, #{memberIcon,jdbcType=VARCHAR}, 
-      #{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{showStatus,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsSubjectComment">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject_comment
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="subjectId != null">
-        subject_id,
-      </if>
-      <if test="memberNickName != null">
-        member_nick_name,
-      </if>
-      <if test="memberIcon != null">
-        member_icon,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="subjectId != null">
-        #{subjectId,jdbcType=BIGINT},
-      </if>
-      <if test="memberNickName != null">
-        #{memberNickName,jdbcType=VARCHAR},
-      </if>
-      <if test="memberIcon != null">
-        #{memberIcon,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectCommentExample" resultType="java.lang.Long">
-    select count(*) from cms_subject_comment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_subject_comment
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.subjectId != null">
-        subject_id = #{record.subjectId,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberNickName != null">
-        member_nick_name = #{record.memberNickName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.memberIcon != null">
-        member_icon = #{record.memberIcon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_subject_comment
-    set id = #{record.id,jdbcType=BIGINT},
-      subject_id = #{record.subjectId,jdbcType=BIGINT},
-      member_nick_name = #{record.memberNickName,jdbcType=VARCHAR},
-      member_icon = #{record.memberIcon,jdbcType=VARCHAR},
-      content = #{record.content,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      show_status = #{record.showStatus,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsSubjectComment">
-    update cms_subject_comment
-    <set>
-      <if test="subjectId != null">
-        subject_id = #{subjectId,jdbcType=BIGINT},
-      </if>
-      <if test="memberNickName != null">
-        member_nick_name = #{memberNickName,jdbcType=VARCHAR},
-      </if>
-      <if test="memberIcon != null">
-        member_icon = #{memberIcon,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsSubjectComment">
-    update cms_subject_comment
-    set subject_id = #{subjectId,jdbcType=BIGINT},
-      member_nick_name = #{memberNickName,jdbcType=VARCHAR},
-      member_icon = #{memberIcon,jdbcType=VARCHAR},
-      content = #{content,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      show_status = #{showStatus,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsSubjectMapper.xml

@@ -1,447 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsSubjectMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsSubject">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="category_id" jdbcType="BIGINT" property="categoryId" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="pic" jdbcType="VARCHAR" property="pic" />
-    <result column="product_count" jdbcType="INTEGER" property="productCount" />
-    <result column="recommend_status" jdbcType="INTEGER" property="recommendStatus" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="collect_count" jdbcType="INTEGER" property="collectCount" />
-    <result column="read_count" jdbcType="INTEGER" property="readCount" />
-    <result column="comment_count" jdbcType="INTEGER" property="commentCount" />
-    <result column="album_pics" jdbcType="VARCHAR" property="albumPics" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-    <result column="forward_count" jdbcType="INTEGER" property="forwardCount" />
-    <result column="category_name" jdbcType="VARCHAR" property="categoryName" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.CmsSubject">
-    <result column="content" jdbcType="LONGVARCHAR" property="content" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, category_id, title, pic, product_count, recommend_status, create_time, collect_count, 
-    read_count, comment_count, album_pics, description, show_status, forward_count, category_name
-  </sql>
-  <sql id="Blob_Column_List">
-    content
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsSubjectExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_subject
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_subject
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_subject
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_subject
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectExample">
-    delete from cms_subject
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsSubject">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject (category_id, title, pic, 
-      product_count, recommend_status, create_time, 
-      collect_count, read_count, comment_count, 
-      album_pics, description, show_status, 
-      forward_count, category_name, content
-      )
-    values (#{categoryId,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, 
-      #{productCount,jdbcType=INTEGER}, #{recommendStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{collectCount,jdbcType=INTEGER}, #{readCount,jdbcType=INTEGER}, #{commentCount,jdbcType=INTEGER}, 
-      #{albumPics,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{showStatus,jdbcType=INTEGER}, 
-      #{forwardCount,jdbcType=INTEGER}, #{categoryName,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsSubject">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="categoryId != null">
-        category_id,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="pic != null">
-        pic,
-      </if>
-      <if test="productCount != null">
-        product_count,
-      </if>
-      <if test="recommendStatus != null">
-        recommend_status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="collectCount != null">
-        collect_count,
-      </if>
-      <if test="readCount != null">
-        read_count,
-      </if>
-      <if test="commentCount != null">
-        comment_count,
-      </if>
-      <if test="albumPics != null">
-        album_pics,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-      <if test="forwardCount != null">
-        forward_count,
-      </if>
-      <if test="categoryName != null">
-        category_name,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="categoryId != null">
-        #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="pic != null">
-        #{pic,jdbcType=VARCHAR},
-      </if>
-      <if test="productCount != null">
-        #{productCount,jdbcType=INTEGER},
-      </if>
-      <if test="recommendStatus != null">
-        #{recommendStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="collectCount != null">
-        #{collectCount,jdbcType=INTEGER},
-      </if>
-      <if test="readCount != null">
-        #{readCount,jdbcType=INTEGER},
-      </if>
-      <if test="commentCount != null">
-        #{commentCount,jdbcType=INTEGER},
-      </if>
-      <if test="albumPics != null">
-        #{albumPics,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="forwardCount != null">
-        #{forwardCount,jdbcType=INTEGER},
-      </if>
-      <if test="categoryName != null">
-        #{categoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectExample" resultType="java.lang.Long">
-    select count(*) from cms_subject
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_subject
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.categoryId != null">
-        category_id = #{record.categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
-      <if test="record.pic != null">
-        pic = #{record.pic,jdbcType=VARCHAR},
-      </if>
-      <if test="record.productCount != null">
-        product_count = #{record.productCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.recommendStatus != null">
-        recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.collectCount != null">
-        collect_count = #{record.collectCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.readCount != null">
-        read_count = #{record.readCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.commentCount != null">
-        comment_count = #{record.commentCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.albumPics != null">
-        album_pics = #{record.albumPics,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.forwardCount != null">
-        forward_count = #{record.forwardCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.categoryName != null">
-        category_name = #{record.categoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update cms_subject
-    set id = #{record.id,jdbcType=BIGINT},
-      category_id = #{record.categoryId,jdbcType=BIGINT},
-      title = #{record.title,jdbcType=VARCHAR},
-      pic = #{record.pic,jdbcType=VARCHAR},
-      product_count = #{record.productCount,jdbcType=INTEGER},
-      recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      collect_count = #{record.collectCount,jdbcType=INTEGER},
-      read_count = #{record.readCount,jdbcType=INTEGER},
-      comment_count = #{record.commentCount,jdbcType=INTEGER},
-      album_pics = #{record.albumPics,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      forward_count = #{record.forwardCount,jdbcType=INTEGER},
-      category_name = #{record.categoryName,jdbcType=VARCHAR},
-      content = #{record.content,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_subject
-    set id = #{record.id,jdbcType=BIGINT},
-      category_id = #{record.categoryId,jdbcType=BIGINT},
-      title = #{record.title,jdbcType=VARCHAR},
-      pic = #{record.pic,jdbcType=VARCHAR},
-      product_count = #{record.productCount,jdbcType=INTEGER},
-      recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      collect_count = #{record.collectCount,jdbcType=INTEGER},
-      read_count = #{record.readCount,jdbcType=INTEGER},
-      comment_count = #{record.commentCount,jdbcType=INTEGER},
-      album_pics = #{record.albumPics,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      forward_count = #{record.forwardCount,jdbcType=INTEGER},
-      category_name = #{record.categoryName,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsSubject">
-    update cms_subject
-    <set>
-      <if test="categoryId != null">
-        category_id = #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="pic != null">
-        pic = #{pic,jdbcType=VARCHAR},
-      </if>
-      <if test="productCount != null">
-        product_count = #{productCount,jdbcType=INTEGER},
-      </if>
-      <if test="recommendStatus != null">
-        recommend_status = #{recommendStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="collectCount != null">
-        collect_count = #{collectCount,jdbcType=INTEGER},
-      </if>
-      <if test="readCount != null">
-        read_count = #{readCount,jdbcType=INTEGER},
-      </if>
-      <if test="commentCount != null">
-        comment_count = #{commentCount,jdbcType=INTEGER},
-      </if>
-      <if test="albumPics != null">
-        album_pics = #{albumPics,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="forwardCount != null">
-        forward_count = #{forwardCount,jdbcType=INTEGER},
-      </if>
-      <if test="categoryName != null">
-        category_name = #{categoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsSubject">
-    update cms_subject
-    set category_id = #{categoryId,jdbcType=BIGINT},
-      title = #{title,jdbcType=VARCHAR},
-      pic = #{pic,jdbcType=VARCHAR},
-      product_count = #{productCount,jdbcType=INTEGER},
-      recommend_status = #{recommendStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      collect_count = #{collectCount,jdbcType=INTEGER},
-      read_count = #{readCount,jdbcType=INTEGER},
-      comment_count = #{commentCount,jdbcType=INTEGER},
-      album_pics = #{albumPics,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      forward_count = #{forwardCount,jdbcType=INTEGER},
-      category_name = #{categoryName,jdbcType=VARCHAR},
-      content = #{content,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsSubject">
-    update cms_subject
-    set category_id = #{categoryId,jdbcType=BIGINT},
-      title = #{title,jdbcType=VARCHAR},
-      pic = #{pic,jdbcType=VARCHAR},
-      product_count = #{productCount,jdbcType=INTEGER},
-      recommend_status = #{recommendStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      collect_count = #{collectCount,jdbcType=INTEGER},
-      read_count = #{readCount,jdbcType=INTEGER},
-      comment_count = #{commentCount,jdbcType=INTEGER},
-      album_pics = #{albumPics,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      forward_count = #{forwardCount,jdbcType=INTEGER},
-      category_name = #{categoryName,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsSubjectProductRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsSubjectProductRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsSubjectProductRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="subject_id" jdbcType="BIGINT" property="subjectId" />
-    <result column="product_id" jdbcType="BIGINT" property="productId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, subject_id, product_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectProductRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_subject_product_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from cms_subject_product_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_subject_product_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectProductRelationExample">
-    delete from cms_subject_product_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsSubjectProductRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject_product_relation (subject_id, product_id)
-    values (#{subjectId,jdbcType=BIGINT}, #{productId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsSubjectProductRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_subject_product_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="subjectId != null">
-        subject_id,
-      </if>
-      <if test="productId != null">
-        product_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="subjectId != null">
-        #{subjectId,jdbcType=BIGINT},
-      </if>
-      <if test="productId != null">
-        #{productId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsSubjectProductRelationExample" resultType="java.lang.Long">
-    select count(*) from cms_subject_product_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_subject_product_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.subjectId != null">
-        subject_id = #{record.subjectId,jdbcType=BIGINT},
-      </if>
-      <if test="record.productId != null">
-        product_id = #{record.productId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_subject_product_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      subject_id = #{record.subjectId,jdbcType=BIGINT},
-      product_id = #{record.productId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsSubjectProductRelation">
-    update cms_subject_product_relation
-    <set>
-      <if test="subjectId != null">
-        subject_id = #{subjectId,jdbcType=BIGINT},
-      </if>
-      <if test="productId != null">
-        product_id = #{productId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsSubjectProductRelation">
-    update cms_subject_product_relation
-    set subject_id = #{subjectId,jdbcType=BIGINT},
-      product_id = #{productId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsTopicCategoryMapper.xml

@@ -1,226 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsTopicCategoryMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsTopicCategory">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="subject_count" jdbcType="INTEGER" property="subjectCount" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, icon, subject_count, show_status, sort
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicCategoryExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_topic_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from cms_topic_category
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_topic_category
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicCategoryExample">
-    delete from cms_topic_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsTopicCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_topic_category (name, icon, subject_count, 
-      show_status, sort)
-    values (#{name,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{subjectCount,jdbcType=INTEGER}, 
-      #{showStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsTopicCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_topic_category
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="subjectCount != null">
-        subject_count,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="subjectCount != null">
-        #{subjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicCategoryExample" resultType="java.lang.Long">
-    select count(*) from cms_topic_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_topic_category
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subjectCount != null">
-        subject_count = #{record.subjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_topic_category
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      subject_count = #{record.subjectCount,jdbcType=INTEGER},
-      show_status = #{record.showStatus,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsTopicCategory">
-    update cms_topic_category
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="subjectCount != null">
-        subject_count = #{subjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsTopicCategory">
-    update cms_topic_category
-    set name = #{name,jdbcType=VARCHAR},
-      icon = #{icon,jdbcType=VARCHAR},
-      subject_count = #{subjectCount,jdbcType=INTEGER},
-      show_status = #{showStatus,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsTopicCommentMapper.xml

@@ -1,243 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsTopicCommentMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsTopicComment">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_nick_name" jdbcType="VARCHAR" property="memberNickName" />
-    <result column="topic_id" jdbcType="BIGINT" property="topicId" />
-    <result column="member_icon" jdbcType="VARCHAR" property="memberIcon" />
-    <result column="content" jdbcType="VARCHAR" property="content" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_nick_name, topic_id, member_icon, content, create_time, show_status
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicCommentExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_topic_comment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from cms_topic_comment
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_topic_comment
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicCommentExample">
-    delete from cms_topic_comment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsTopicComment">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_topic_comment (member_nick_name, topic_id, member_icon, 
-      content, create_time, show_status
-      )
-    values (#{memberNickName,jdbcType=VARCHAR}, #{topicId,jdbcType=BIGINT}, #{memberIcon,jdbcType=VARCHAR}, 
-      #{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{showStatus,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsTopicComment">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_topic_comment
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberNickName != null">
-        member_nick_name,
-      </if>
-      <if test="topicId != null">
-        topic_id,
-      </if>
-      <if test="memberIcon != null">
-        member_icon,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="showStatus != null">
-        show_status,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberNickName != null">
-        #{memberNickName,jdbcType=VARCHAR},
-      </if>
-      <if test="topicId != null">
-        #{topicId,jdbcType=BIGINT},
-      </if>
-      <if test="memberIcon != null">
-        #{memberIcon,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="showStatus != null">
-        #{showStatus,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicCommentExample" resultType="java.lang.Long">
-    select count(*) from cms_topic_comment
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_topic_comment
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberNickName != null">
-        member_nick_name = #{record.memberNickName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.topicId != null">
-        topic_id = #{record.topicId,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberIcon != null">
-        member_icon = #{record.memberIcon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.showStatus != null">
-        show_status = #{record.showStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_topic_comment
-    set id = #{record.id,jdbcType=BIGINT},
-      member_nick_name = #{record.memberNickName,jdbcType=VARCHAR},
-      topic_id = #{record.topicId,jdbcType=BIGINT},
-      member_icon = #{record.memberIcon,jdbcType=VARCHAR},
-      content = #{record.content,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      show_status = #{record.showStatus,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsTopicComment">
-    update cms_topic_comment
-    <set>
-      <if test="memberNickName != null">
-        member_nick_name = #{memberNickName,jdbcType=VARCHAR},
-      </if>
-      <if test="topicId != null">
-        topic_id = #{topicId,jdbcType=BIGINT},
-      </if>
-      <if test="memberIcon != null">
-        member_icon = #{memberIcon,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="showStatus != null">
-        show_status = #{showStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsTopicComment">
-    update cms_topic_comment
-    set member_nick_name = #{memberNickName,jdbcType=VARCHAR},
-      topic_id = #{topicId,jdbcType=BIGINT},
-      member_icon = #{memberIcon,jdbcType=VARCHAR},
-      content = #{content,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      show_status = #{showStatus,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/CmsTopicMapper.xml

@@ -1,375 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.CmsTopicMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.CmsTopic">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="category_id" jdbcType="BIGINT" property="categoryId" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
-    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
-    <result column="attend_count" jdbcType="INTEGER" property="attendCount" />
-    <result column="attention_count" jdbcType="INTEGER" property="attentionCount" />
-    <result column="read_count" jdbcType="INTEGER" property="readCount" />
-    <result column="award_name" jdbcType="VARCHAR" property="awardName" />
-    <result column="attend_type" jdbcType="VARCHAR" property="attendType" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.CmsTopic">
-    <result column="content" jdbcType="LONGVARCHAR" property="content" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, category_id, name, create_time, start_time, end_time, attend_count, attention_count, 
-    read_count, award_name, attend_type
-  </sql>
-  <sql id="Blob_Column_List">
-    content
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsTopicExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_topic
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_topic
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_topic
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cms_topic
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicExample">
-    delete from cms_topic
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.CmsTopic">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_topic (category_id, name, create_time, 
-      start_time, end_time, attend_count, 
-      attention_count, read_count, award_name, 
-      attend_type, content)
-    values (#{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{attendCount,jdbcType=INTEGER}, 
-      #{attentionCount,jdbcType=INTEGER}, #{readCount,jdbcType=INTEGER}, #{awardName,jdbcType=VARCHAR}, 
-      #{attendType,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.CmsTopic">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into cms_topic
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="categoryId != null">
-        category_id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="startTime != null">
-        start_time,
-      </if>
-      <if test="endTime != null">
-        end_time,
-      </if>
-      <if test="attendCount != null">
-        attend_count,
-      </if>
-      <if test="attentionCount != null">
-        attention_count,
-      </if>
-      <if test="readCount != null">
-        read_count,
-      </if>
-      <if test="awardName != null">
-        award_name,
-      </if>
-      <if test="attendType != null">
-        attend_type,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="categoryId != null">
-        #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startTime != null">
-        #{startTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endTime != null">
-        #{endTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="attendCount != null">
-        #{attendCount,jdbcType=INTEGER},
-      </if>
-      <if test="attentionCount != null">
-        #{attentionCount,jdbcType=INTEGER},
-      </if>
-      <if test="readCount != null">
-        #{readCount,jdbcType=INTEGER},
-      </if>
-      <if test="awardName != null">
-        #{awardName,jdbcType=VARCHAR},
-      </if>
-      <if test="attendType != null">
-        #{attendType,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.CmsTopicExample" resultType="java.lang.Long">
-    select count(*) from cms_topic
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update cms_topic
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.categoryId != null">
-        category_id = #{record.categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.startTime != null">
-        start_time = #{record.startTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.endTime != null">
-        end_time = #{record.endTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.attendCount != null">
-        attend_count = #{record.attendCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.attentionCount != null">
-        attention_count = #{record.attentionCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.readCount != null">
-        read_count = #{record.readCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.awardName != null">
-        award_name = #{record.awardName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.attendType != null">
-        attend_type = #{record.attendType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update cms_topic
-    set id = #{record.id,jdbcType=BIGINT},
-      category_id = #{record.categoryId,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      start_time = #{record.startTime,jdbcType=TIMESTAMP},
-      end_time = #{record.endTime,jdbcType=TIMESTAMP},
-      attend_count = #{record.attendCount,jdbcType=INTEGER},
-      attention_count = #{record.attentionCount,jdbcType=INTEGER},
-      read_count = #{record.readCount,jdbcType=INTEGER},
-      award_name = #{record.awardName,jdbcType=VARCHAR},
-      attend_type = #{record.attendType,jdbcType=VARCHAR},
-      content = #{record.content,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update cms_topic
-    set id = #{record.id,jdbcType=BIGINT},
-      category_id = #{record.categoryId,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      start_time = #{record.startTime,jdbcType=TIMESTAMP},
-      end_time = #{record.endTime,jdbcType=TIMESTAMP},
-      attend_count = #{record.attendCount,jdbcType=INTEGER},
-      attention_count = #{record.attentionCount,jdbcType=INTEGER},
-      read_count = #{record.readCount,jdbcType=INTEGER},
-      award_name = #{record.awardName,jdbcType=VARCHAR},
-      attend_type = #{record.attendType,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.CmsTopic">
-    update cms_topic
-    <set>
-      <if test="categoryId != null">
-        category_id = #{categoryId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startTime != null">
-        start_time = #{startTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endTime != null">
-        end_time = #{endTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="attendCount != null">
-        attend_count = #{attendCount,jdbcType=INTEGER},
-      </if>
-      <if test="attentionCount != null">
-        attention_count = #{attentionCount,jdbcType=INTEGER},
-      </if>
-      <if test="readCount != null">
-        read_count = #{readCount,jdbcType=INTEGER},
-      </if>
-      <if test="awardName != null">
-        award_name = #{awardName,jdbcType=VARCHAR},
-      </if>
-      <if test="attendType != null">
-        attend_type = #{attendType,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.CmsTopic">
-    update cms_topic
-    set category_id = #{categoryId,jdbcType=BIGINT},
-      name = #{name,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      start_time = #{startTime,jdbcType=TIMESTAMP},
-      end_time = #{endTime,jdbcType=TIMESTAMP},
-      attend_count = #{attendCount,jdbcType=INTEGER},
-      attention_count = #{attentionCount,jdbcType=INTEGER},
-      read_count = #{readCount,jdbcType=INTEGER},
-      award_name = #{awardName,jdbcType=VARCHAR},
-      attend_type = #{attendType,jdbcType=VARCHAR},
-      content = #{content,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.CmsTopic">
-    update cms_topic
-    set category_id = #{categoryId,jdbcType=BIGINT},
-      name = #{name,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      start_time = #{startTime,jdbcType=TIMESTAMP},
-      end_time = #{endTime,jdbcType=TIMESTAMP},
-      attend_count = #{attendCount,jdbcType=INTEGER},
-      attention_count = #{attentionCount,jdbcType=INTEGER},
-      read_count = #{readCount,jdbcType=INTEGER},
-      award_name = #{awardName,jdbcType=VARCHAR},
-      attend_type = #{attendType,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsAdminLoginLogMapper.xml

@@ -1,226 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsAdminLoginLogMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsAdminLoginLog">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="admin_id" jdbcType="BIGINT" property="adminId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="ip" jdbcType="VARCHAR" property="ip" />
-    <result column="address" jdbcType="VARCHAR" property="address" />
-    <result column="user_agent" jdbcType="VARCHAR" property="userAgent" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, admin_id, create_time, ip, address, user_agent
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminLoginLogExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_admin_login_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_admin_login_log
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_admin_login_log
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminLoginLogExample">
-    delete from ums_admin_login_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsAdminLoginLog">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin_login_log (admin_id, create_time, ip, 
-      address, user_agent)
-    values (#{adminId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{ip,jdbcType=VARCHAR}, 
-      #{address,jdbcType=VARCHAR}, #{userAgent,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsAdminLoginLog">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin_login_log
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="adminId != null">
-        admin_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="ip != null">
-        ip,
-      </if>
-      <if test="address != null">
-        address,
-      </if>
-      <if test="userAgent != null">
-        user_agent,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="adminId != null">
-        #{adminId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ip != null">
-        #{ip,jdbcType=VARCHAR},
-      </if>
-      <if test="address != null">
-        #{address,jdbcType=VARCHAR},
-      </if>
-      <if test="userAgent != null">
-        #{userAgent,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminLoginLogExample" resultType="java.lang.Long">
-    select count(*) from ums_admin_login_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_admin_login_log
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.adminId != null">
-        admin_id = #{record.adminId,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.ip != null">
-        ip = #{record.ip,jdbcType=VARCHAR},
-      </if>
-      <if test="record.address != null">
-        address = #{record.address,jdbcType=VARCHAR},
-      </if>
-      <if test="record.userAgent != null">
-        user_agent = #{record.userAgent,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_admin_login_log
-    set id = #{record.id,jdbcType=BIGINT},
-      admin_id = #{record.adminId,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      ip = #{record.ip,jdbcType=VARCHAR},
-      address = #{record.address,jdbcType=VARCHAR},
-      user_agent = #{record.userAgent,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsAdminLoginLog">
-    update ums_admin_login_log
-    <set>
-      <if test="adminId != null">
-        admin_id = #{adminId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ip != null">
-        ip = #{ip,jdbcType=VARCHAR},
-      </if>
-      <if test="address != null">
-        address = #{address,jdbcType=VARCHAR},
-      </if>
-      <if test="userAgent != null">
-        user_agent = #{userAgent,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsAdminLoginLog">
-    update ums_admin_login_log
-    set admin_id = #{adminId,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      ip = #{ip,jdbcType=VARCHAR},
-      address = #{address,jdbcType=VARCHAR},
-      user_agent = #{userAgent,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsAdminMapper.xml

@@ -1,290 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsAdminMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsAdmin">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="username" jdbcType="VARCHAR" property="username" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="email" jdbcType="VARCHAR" property="email" />
-    <result column="nick_name" jdbcType="VARCHAR" property="nickName" />
-    <result column="note" jdbcType="VARCHAR" property="note" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="login_time" jdbcType="TIMESTAMP" property="loginTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, username, password, icon, email, nick_name, note, create_time, login_time, status
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_admin
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_admin
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_admin
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminExample">
-    delete from ums_admin
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsAdmin">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin (username, password, icon, 
-      email, nick_name, note, 
-      create_time, login_time, status
-      )
-    values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, 
-      #{email,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{loginTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsAdmin">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="username != null">
-        username,
-      </if>
-      <if test="password != null">
-        password,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="email != null">
-        email,
-      </if>
-      <if test="nickName != null">
-        nick_name,
-      </if>
-      <if test="note != null">
-        note,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="loginTime != null">
-        login_time,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="username != null">
-        #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="nickName != null">
-        #{nickName,jdbcType=VARCHAR},
-      </if>
-      <if test="note != null">
-        #{note,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="loginTime != null">
-        #{loginTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminExample" resultType="java.lang.Long">
-    select count(*) from ums_admin
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_admin
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.username != null">
-        username = #{record.username,jdbcType=VARCHAR},
-      </if>
-      <if test="record.password != null">
-        password = #{record.password,jdbcType=VARCHAR},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.email != null">
-        email = #{record.email,jdbcType=VARCHAR},
-      </if>
-      <if test="record.nickName != null">
-        nick_name = #{record.nickName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.note != null">
-        note = #{record.note,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.loginTime != null">
-        login_time = #{record.loginTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_admin
-    set id = #{record.id,jdbcType=BIGINT},
-      username = #{record.username,jdbcType=VARCHAR},
-      password = #{record.password,jdbcType=VARCHAR},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      email = #{record.email,jdbcType=VARCHAR},
-      nick_name = #{record.nickName,jdbcType=VARCHAR},
-      note = #{record.note,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      login_time = #{record.loginTime,jdbcType=TIMESTAMP},
-      status = #{record.status,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsAdmin">
-    update ums_admin
-    <set>
-      <if test="username != null">
-        username = #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        email = #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="nickName != null">
-        nick_name = #{nickName,jdbcType=VARCHAR},
-      </if>
-      <if test="note != null">
-        note = #{note,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="loginTime != null">
-        login_time = #{loginTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsAdmin">
-    update ums_admin
-    set username = #{username,jdbcType=VARCHAR},
-      password = #{password,jdbcType=VARCHAR},
-      icon = #{icon,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR},
-      nick_name = #{nickName,jdbcType=VARCHAR},
-      note = #{note,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      login_time = #{loginTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsAdminPermissionRelationMapper.xml

@@ -1,196 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsAdminPermissionRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsAdminPermissionRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="admin_id" jdbcType="BIGINT" property="adminId" />
-    <result column="permission_id" jdbcType="BIGINT" property="permissionId" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, admin_id, permission_id, type
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminPermissionRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_admin_permission_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_admin_permission_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_admin_permission_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminPermissionRelationExample">
-    delete from ums_admin_permission_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsAdminPermissionRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin_permission_relation (admin_id, permission_id, type
-      )
-    values (#{adminId,jdbcType=BIGINT}, #{permissionId,jdbcType=BIGINT}, #{type,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsAdminPermissionRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin_permission_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="adminId != null">
-        admin_id,
-      </if>
-      <if test="permissionId != null">
-        permission_id,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="adminId != null">
-        #{adminId,jdbcType=BIGINT},
-      </if>
-      <if test="permissionId != null">
-        #{permissionId,jdbcType=BIGINT},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminPermissionRelationExample" resultType="java.lang.Long">
-    select count(*) from ums_admin_permission_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_admin_permission_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.adminId != null">
-        admin_id = #{record.adminId,jdbcType=BIGINT},
-      </if>
-      <if test="record.permissionId != null">
-        permission_id = #{record.permissionId,jdbcType=BIGINT},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_admin_permission_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      admin_id = #{record.adminId,jdbcType=BIGINT},
-      permission_id = #{record.permissionId,jdbcType=BIGINT},
-      type = #{record.type,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsAdminPermissionRelation">
-    update ums_admin_permission_relation
-    <set>
-      <if test="adminId != null">
-        admin_id = #{adminId,jdbcType=BIGINT},
-      </if>
-      <if test="permissionId != null">
-        permission_id = #{permissionId,jdbcType=BIGINT},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsAdminPermissionRelation">
-    update ums_admin_permission_relation
-    set admin_id = #{adminId,jdbcType=BIGINT},
-      permission_id = #{permissionId,jdbcType=BIGINT},
-      type = #{type,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsAdminRoleRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsAdminRoleRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsAdminRoleRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="admin_id" jdbcType="BIGINT" property="adminId" />
-    <result column="role_id" jdbcType="BIGINT" property="roleId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, admin_id, role_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminRoleRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_admin_role_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_admin_role_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_admin_role_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminRoleRelationExample">
-    delete from ums_admin_role_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsAdminRoleRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin_role_relation (admin_id, role_id)
-    values (#{adminId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsAdminRoleRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_admin_role_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="adminId != null">
-        admin_id,
-      </if>
-      <if test="roleId != null">
-        role_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="adminId != null">
-        #{adminId,jdbcType=BIGINT},
-      </if>
-      <if test="roleId != null">
-        #{roleId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsAdminRoleRelationExample" resultType="java.lang.Long">
-    select count(*) from ums_admin_role_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_admin_role_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.adminId != null">
-        admin_id = #{record.adminId,jdbcType=BIGINT},
-      </if>
-      <if test="record.roleId != null">
-        role_id = #{record.roleId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_admin_role_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      admin_id = #{record.adminId,jdbcType=BIGINT},
-      role_id = #{record.roleId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsAdminRoleRelation">
-    update ums_admin_role_relation
-    <set>
-      <if test="adminId != null">
-        admin_id = #{adminId,jdbcType=BIGINT},
-      </if>
-      <if test="roleId != null">
-        role_id = #{roleId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsAdminRoleRelation">
-    update ums_admin_role_relation
-    set admin_id = #{adminId,jdbcType=BIGINT},
-      role_id = #{roleId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsCompanyFileMapper.xml

@@ -1,274 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsCompanyFileMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsCompanyFile">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="comp_id" jdbcType="BIGINT" property="compId" />
-    <result column="file_url" jdbcType="VARCHAR" property="fileUrl" />
-    <result column="file_type" jdbcType="VARCHAR" property="fileType" />
-    <result column="file_status" jdbcType="INTEGER" property="fileStatus" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="update_id" jdbcType="INTEGER" property="updateId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, comp_id, file_url, file_type, file_status, create_time, create_id, update_time, 
-    update_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFileExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_company_file
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_company_file
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_company_file
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFileExample">
-    delete from ums_company_file
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFile">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_company_file (comp_id, file_url, file_type, 
-      file_status, create_time, create_id, 
-      update_time, update_id)
-    values (#{compId,jdbcType=BIGINT}, #{fileUrl,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
-      #{fileStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFile">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_company_file
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="compId != null">
-        comp_id,
-      </if>
-      <if test="fileUrl != null">
-        file_url,
-      </if>
-      <if test="fileType != null">
-        file_type,
-      </if>
-      <if test="fileStatus != null">
-        file_status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="createId != null">
-        create_id,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="updateId != null">
-        update_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="compId != null">
-        #{compId,jdbcType=BIGINT},
-      </if>
-      <if test="fileUrl != null">
-        #{fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="fileType != null">
-        #{fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="fileStatus != null">
-        #{fileStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateId != null">
-        #{updateId,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFileExample" resultType="java.lang.Long">
-    select count(*) from ums_company_file
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_company_file
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.compId != null">
-        comp_id = #{record.compId,jdbcType=BIGINT},
-      </if>
-      <if test="record.fileUrl != null">
-        file_url = #{record.fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileType != null">
-        file_type = #{record.fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileStatus != null">
-        file_status = #{record.fileStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateId != null">
-        update_id = #{record.updateId,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_company_file
-    set id = #{record.id,jdbcType=BIGINT},
-      comp_id = #{record.compId,jdbcType=BIGINT},
-      file_url = #{record.fileUrl,jdbcType=VARCHAR},
-      file_type = #{record.fileType,jdbcType=VARCHAR},
-      file_status = #{record.fileStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFile">
-    update ums_company_file
-    <set>
-      <if test="compId != null">
-        comp_id = #{compId,jdbcType=BIGINT},
-      </if>
-      <if test="fileUrl != null">
-        file_url = #{fileUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="fileType != null">
-        file_type = #{fileType,jdbcType=VARCHAR},
-      </if>
-      <if test="fileStatus != null">
-        file_status = #{fileStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateId != null">
-        update_id = #{updateId,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFile">
-    update ums_company_file
-    set comp_id = #{compId,jdbcType=BIGINT},
-      file_url = #{fileUrl,jdbcType=VARCHAR},
-      file_type = #{fileType,jdbcType=VARCHAR},
-      file_status = #{fileStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsCompanyInfoMapper.xml

@@ -1,625 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsCompanyInfoMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="comp_name" jdbcType="VARCHAR" property="compName" />
-    <result column="comp_imgs" jdbcType="VARCHAR" property="compImgs" />
-    <result column="comp_url" jdbcType="VARCHAR" property="compUrl" />
-    <result column="comp_prod_license_num" jdbcType="VARCHAR" property="compProdLicenseNum" />
-    <result column="comp_manage_license_num" jdbcType="VARCHAR" property="compManageLicenseNum" />
-    <result column="comp_social_code" jdbcType="VARCHAR" property="compSocialCode" />
-    <result column="comp_con_person" jdbcType="VARCHAR" property="compConPerson" />
-    <result column="comp_con_type" jdbcType="VARCHAR" property="compConType" />
-    <result column="comp_con_num" jdbcType="VARCHAR" property="compConNum" />
-    <result column="comp_qq" jdbcType="VARCHAR" property="compQq" />
-    <result column="comp_manage_product" jdbcType="VARCHAR" property="compManageProduct" />
-    <result column="province_id" jdbcType="VARCHAR" property="provinceId" />
-    <result column="city_id" jdbcType="VARCHAR" property="cityId" />
-    <result column="county_id" jdbcType="VARCHAR" property="countyId" />
-    <result column="town_id" jdbcType="VARCHAR" property="townId" />
-    <result column="village_id" jdbcType="VARCHAR" property="villageId" />
-    <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
-    <result column="longitude" jdbcType="VARCHAR" property="longitude" />
-    <result column="latitude" jdbcType="VARCHAR" property="latitude" />
-    <result column="comp_status" jdbcType="INTEGER" property="compStatus" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="update_id" jdbcType="INTEGER" property="updateId" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    <result column="comp_introduction" jdbcType="LONGVARCHAR" property="compIntroduction" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, comp_name, comp_imgs, comp_url, comp_prod_license_num, comp_manage_license_num, 
-    comp_social_code, comp_con_person, comp_con_type, comp_con_num, comp_qq, comp_manage_product, 
-    province_id, city_id, county_id, town_id, village_id, detail_address, longitude, 
-    latitude, comp_status, create_time, create_id, update_time, update_id
-  </sql>
-  <sql id="Blob_Column_List">
-    comp_introduction
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfoExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from ums_company_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfoExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_company_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from ums_company_info
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_company_info
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfoExample">
-    delete from ums_company_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_company_info (comp_name, comp_imgs, comp_url, 
-      comp_prod_license_num, comp_manage_license_num, 
-      comp_social_code, comp_con_person, comp_con_type, 
-      comp_con_num, comp_qq, comp_manage_product, 
-      province_id, city_id, county_id, 
-      town_id, village_id, detail_address, 
-      longitude, latitude, comp_status, 
-      create_time, create_id, update_time, 
-      update_id, comp_introduction)
-    values (#{compName,jdbcType=VARCHAR}, #{compImgs,jdbcType=VARCHAR}, #{compUrl,jdbcType=VARCHAR}, 
-      #{compProdLicenseNum,jdbcType=VARCHAR}, #{compManageLicenseNum,jdbcType=VARCHAR}, 
-      #{compSocialCode,jdbcType=VARCHAR}, #{compConPerson,jdbcType=VARCHAR}, #{compConType,jdbcType=VARCHAR}, 
-      #{compConNum,jdbcType=VARCHAR}, #{compQq,jdbcType=VARCHAR}, #{compManageProduct,jdbcType=VARCHAR}, 
-      #{provinceId,jdbcType=VARCHAR}, #{cityId,jdbcType=VARCHAR}, #{countyId,jdbcType=VARCHAR}, 
-      #{townId,jdbcType=VARCHAR}, #{villageId,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, 
-      #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{compStatus,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{updateId,jdbcType=INTEGER}, #{compIntroduction,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_company_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="compName != null">
-        comp_name,
-      </if>
-      <if test="compImgs != null">
-        comp_imgs,
-      </if>
-      <if test="compUrl != null">
-        comp_url,
-      </if>
-      <if test="compProdLicenseNum != null">
-        comp_prod_license_num,
-      </if>
-      <if test="compManageLicenseNum != null">
-        comp_manage_license_num,
-      </if>
-      <if test="compSocialCode != null">
-        comp_social_code,
-      </if>
-      <if test="compConPerson != null">
-        comp_con_person,
-      </if>
-      <if test="compConType != null">
-        comp_con_type,
-      </if>
-      <if test="compConNum != null">
-        comp_con_num,
-      </if>
-      <if test="compQq != null">
-        comp_qq,
-      </if>
-      <if test="compManageProduct != null">
-        comp_manage_product,
-      </if>
-      <if test="provinceId != null">
-        province_id,
-      </if>
-      <if test="cityId != null">
-        city_id,
-      </if>
-      <if test="countyId != null">
-        county_id,
-      </if>
-      <if test="townId != null">
-        town_id,
-      </if>
-      <if test="villageId != null">
-        village_id,
-      </if>
-      <if test="detailAddress != null">
-        detail_address,
-      </if>
-      <if test="longitude != null">
-        longitude,
-      </if>
-      <if test="latitude != null">
-        latitude,
-      </if>
-      <if test="compStatus != null">
-        comp_status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="createId != null">
-        create_id,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="updateId != null">
-        update_id,
-      </if>
-      <if test="compIntroduction != null">
-        comp_introduction,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="compName != null">
-        #{compName,jdbcType=VARCHAR},
-      </if>
-      <if test="compImgs != null">
-        #{compImgs,jdbcType=VARCHAR},
-      </if>
-      <if test="compUrl != null">
-        #{compUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="compProdLicenseNum != null">
-        #{compProdLicenseNum,jdbcType=VARCHAR},
-      </if>
-      <if test="compManageLicenseNum != null">
-        #{compManageLicenseNum,jdbcType=VARCHAR},
-      </if>
-      <if test="compSocialCode != null">
-        #{compSocialCode,jdbcType=VARCHAR},
-      </if>
-      <if test="compConPerson != null">
-        #{compConPerson,jdbcType=VARCHAR},
-      </if>
-      <if test="compConType != null">
-        #{compConType,jdbcType=VARCHAR},
-      </if>
-      <if test="compConNum != null">
-        #{compConNum,jdbcType=VARCHAR},
-      </if>
-      <if test="compQq != null">
-        #{compQq,jdbcType=VARCHAR},
-      </if>
-      <if test="compManageProduct != null">
-        #{compManageProduct,jdbcType=VARCHAR},
-      </if>
-      <if test="provinceId != null">
-        #{provinceId,jdbcType=VARCHAR},
-      </if>
-      <if test="cityId != null">
-        #{cityId,jdbcType=VARCHAR},
-      </if>
-      <if test="countyId != null">
-        #{countyId,jdbcType=VARCHAR},
-      </if>
-      <if test="townId != null">
-        #{townId,jdbcType=VARCHAR},
-      </if>
-      <if test="villageId != null">
-        #{villageId,jdbcType=VARCHAR},
-      </if>
-      <if test="detailAddress != null">
-        #{detailAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="longitude != null">
-        #{longitude,jdbcType=VARCHAR},
-      </if>
-      <if test="latitude != null">
-        #{latitude,jdbcType=VARCHAR},
-      </if>
-      <if test="compStatus != null">
-        #{compStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateId != null">
-        #{updateId,jdbcType=INTEGER},
-      </if>
-      <if test="compIntroduction != null">
-        #{compIntroduction,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfoExample" resultType="java.lang.Long">
-    select count(*) from ums_company_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_company_info
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.compName != null">
-        comp_name = #{record.compName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compImgs != null">
-        comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compUrl != null">
-        comp_url = #{record.compUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compProdLicenseNum != null">
-        comp_prod_license_num = #{record.compProdLicenseNum,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compManageLicenseNum != null">
-        comp_manage_license_num = #{record.compManageLicenseNum,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compSocialCode != null">
-        comp_social_code = #{record.compSocialCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compConPerson != null">
-        comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compConType != null">
-        comp_con_type = #{record.compConType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compConNum != null">
-        comp_con_num = #{record.compConNum,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compQq != null">
-        comp_qq = #{record.compQq,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compManageProduct != null">
-        comp_manage_product = #{record.compManageProduct,jdbcType=VARCHAR},
-      </if>
-      <if test="record.provinceId != null">
-        province_id = #{record.provinceId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.cityId != null">
-        city_id = #{record.cityId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.countyId != null">
-        county_id = #{record.countyId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.townId != null">
-        town_id = #{record.townId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.villageId != null">
-        village_id = #{record.villageId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.detailAddress != null">
-        detail_address = #{record.detailAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="record.longitude != null">
-        longitude = #{record.longitude,jdbcType=VARCHAR},
-      </if>
-      <if test="record.latitude != null">
-        latitude = #{record.latitude,jdbcType=VARCHAR},
-      </if>
-      <if test="record.compStatus != null">
-        comp_status = #{record.compStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateId != null">
-        update_id = #{record.updateId,jdbcType=INTEGER},
-      </if>
-      <if test="record.compIntroduction != null">
-        comp_introduction = #{record.compIntroduction,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update ums_company_info
-    set id = #{record.id,jdbcType=BIGINT},
-      comp_name = #{record.compName,jdbcType=VARCHAR},
-      comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
-      comp_url = #{record.compUrl,jdbcType=VARCHAR},
-      comp_prod_license_num = #{record.compProdLicenseNum,jdbcType=VARCHAR},
-      comp_manage_license_num = #{record.compManageLicenseNum,jdbcType=VARCHAR},
-      comp_social_code = #{record.compSocialCode,jdbcType=VARCHAR},
-      comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
-      comp_con_type = #{record.compConType,jdbcType=VARCHAR},
-      comp_con_num = #{record.compConNum,jdbcType=VARCHAR},
-      comp_qq = #{record.compQq,jdbcType=VARCHAR},
-      comp_manage_product = #{record.compManageProduct,jdbcType=VARCHAR},
-      province_id = #{record.provinceId,jdbcType=VARCHAR},
-      city_id = #{record.cityId,jdbcType=VARCHAR},
-      county_id = #{record.countyId,jdbcType=VARCHAR},
-      town_id = #{record.townId,jdbcType=VARCHAR},
-      village_id = #{record.villageId,jdbcType=VARCHAR},
-      detail_address = #{record.detailAddress,jdbcType=VARCHAR},
-      longitude = #{record.longitude,jdbcType=VARCHAR},
-      latitude = #{record.latitude,jdbcType=VARCHAR},
-      comp_status = #{record.compStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER},
-      comp_introduction = #{record.compIntroduction,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_company_info
-    set id = #{record.id,jdbcType=BIGINT},
-      comp_name = #{record.compName,jdbcType=VARCHAR},
-      comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
-      comp_url = #{record.compUrl,jdbcType=VARCHAR},
-      comp_prod_license_num = #{record.compProdLicenseNum,jdbcType=VARCHAR},
-      comp_manage_license_num = #{record.compManageLicenseNum,jdbcType=VARCHAR},
-      comp_social_code = #{record.compSocialCode,jdbcType=VARCHAR},
-      comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
-      comp_con_type = #{record.compConType,jdbcType=VARCHAR},
-      comp_con_num = #{record.compConNum,jdbcType=VARCHAR},
-      comp_qq = #{record.compQq,jdbcType=VARCHAR},
-      comp_manage_product = #{record.compManageProduct,jdbcType=VARCHAR},
-      province_id = #{record.provinceId,jdbcType=VARCHAR},
-      city_id = #{record.cityId,jdbcType=VARCHAR},
-      county_id = #{record.countyId,jdbcType=VARCHAR},
-      town_id = #{record.townId,jdbcType=VARCHAR},
-      village_id = #{record.villageId,jdbcType=VARCHAR},
-      detail_address = #{record.detailAddress,jdbcType=VARCHAR},
-      longitude = #{record.longitude,jdbcType=VARCHAR},
-      latitude = #{record.latitude,jdbcType=VARCHAR},
-      comp_status = #{record.compStatus,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    update ums_company_info
-    <set>
-      <if test="compName != null">
-        comp_name = #{compName,jdbcType=VARCHAR},
-      </if>
-      <if test="compImgs != null">
-        comp_imgs = #{compImgs,jdbcType=VARCHAR},
-      </if>
-      <if test="compUrl != null">
-        comp_url = #{compUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="compProdLicenseNum != null">
-        comp_prod_license_num = #{compProdLicenseNum,jdbcType=VARCHAR},
-      </if>
-      <if test="compManageLicenseNum != null">
-        comp_manage_license_num = #{compManageLicenseNum,jdbcType=VARCHAR},
-      </if>
-      <if test="compSocialCode != null">
-        comp_social_code = #{compSocialCode,jdbcType=VARCHAR},
-      </if>
-      <if test="compConPerson != null">
-        comp_con_person = #{compConPerson,jdbcType=VARCHAR},
-      </if>
-      <if test="compConType != null">
-        comp_con_type = #{compConType,jdbcType=VARCHAR},
-      </if>
-      <if test="compConNum != null">
-        comp_con_num = #{compConNum,jdbcType=VARCHAR},
-      </if>
-      <if test="compQq != null">
-        comp_qq = #{compQq,jdbcType=VARCHAR},
-      </if>
-      <if test="compManageProduct != null">
-        comp_manage_product = #{compManageProduct,jdbcType=VARCHAR},
-      </if>
-      <if test="provinceId != null">
-        province_id = #{provinceId,jdbcType=VARCHAR},
-      </if>
-      <if test="cityId != null">
-        city_id = #{cityId,jdbcType=VARCHAR},
-      </if>
-      <if test="countyId != null">
-        county_id = #{countyId,jdbcType=VARCHAR},
-      </if>
-      <if test="townId != null">
-        town_id = #{townId,jdbcType=VARCHAR},
-      </if>
-      <if test="villageId != null">
-        village_id = #{villageId,jdbcType=VARCHAR},
-      </if>
-      <if test="detailAddress != null">
-        detail_address = #{detailAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="longitude != null">
-        longitude = #{longitude,jdbcType=VARCHAR},
-      </if>
-      <if test="latitude != null">
-        latitude = #{latitude,jdbcType=VARCHAR},
-      </if>
-      <if test="compStatus != null">
-        comp_status = #{compStatus,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateId != null">
-        update_id = #{updateId,jdbcType=INTEGER},
-      </if>
-      <if test="compIntroduction != null">
-        comp_introduction = #{compIntroduction,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    update ums_company_info
-    set comp_name = #{compName,jdbcType=VARCHAR},
-      comp_imgs = #{compImgs,jdbcType=VARCHAR},
-      comp_url = #{compUrl,jdbcType=VARCHAR},
-      comp_prod_license_num = #{compProdLicenseNum,jdbcType=VARCHAR},
-      comp_manage_license_num = #{compManageLicenseNum,jdbcType=VARCHAR},
-      comp_social_code = #{compSocialCode,jdbcType=VARCHAR},
-      comp_con_person = #{compConPerson,jdbcType=VARCHAR},
-      comp_con_type = #{compConType,jdbcType=VARCHAR},
-      comp_con_num = #{compConNum,jdbcType=VARCHAR},
-      comp_qq = #{compQq,jdbcType=VARCHAR},
-      comp_manage_product = #{compManageProduct,jdbcType=VARCHAR},
-      province_id = #{provinceId,jdbcType=VARCHAR},
-      city_id = #{cityId,jdbcType=VARCHAR},
-      county_id = #{countyId,jdbcType=VARCHAR},
-      town_id = #{townId,jdbcType=VARCHAR},
-      village_id = #{villageId,jdbcType=VARCHAR},
-      detail_address = #{detailAddress,jdbcType=VARCHAR},
-      longitude = #{longitude,jdbcType=VARCHAR},
-      latitude = #{latitude,jdbcType=VARCHAR},
-      comp_status = #{compStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER},
-      comp_introduction = #{compIntroduction,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    update ums_company_info
-    set comp_name = #{compName,jdbcType=VARCHAR},
-      comp_imgs = #{compImgs,jdbcType=VARCHAR},
-      comp_url = #{compUrl,jdbcType=VARCHAR},
-      comp_prod_license_num = #{compProdLicenseNum,jdbcType=VARCHAR},
-      comp_manage_license_num = #{compManageLicenseNum,jdbcType=VARCHAR},
-      comp_social_code = #{compSocialCode,jdbcType=VARCHAR},
-      comp_con_person = #{compConPerson,jdbcType=VARCHAR},
-      comp_con_type = #{compConType,jdbcType=VARCHAR},
-      comp_con_num = #{compConNum,jdbcType=VARCHAR},
-      comp_qq = #{compQq,jdbcType=VARCHAR},
-      comp_manage_product = #{compManageProduct,jdbcType=VARCHAR},
-      province_id = #{provinceId,jdbcType=VARCHAR},
-      city_id = #{cityId,jdbcType=VARCHAR},
-      county_id = #{countyId,jdbcType=VARCHAR},
-      town_id = #{townId,jdbcType=VARCHAR},
-      village_id = #{villageId,jdbcType=VARCHAR},
-      detail_address = #{detailAddress,jdbcType=VARCHAR},
-      longitude = #{longitude,jdbcType=VARCHAR},
-      latitude = #{latitude,jdbcType=VARCHAR},
-      comp_status = #{compStatus,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsCompanyShopMapper.xml

@@ -1,291 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsCompanyShopMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="comp_id" jdbcType="INTEGER" property="compId" />
-    <result column="shop_type" jdbcType="VARCHAR" property="shopType" />
-    <result column="shop_url" jdbcType="VARCHAR" property="shopUrl" />
-    <result column="shop_address" jdbcType="VARCHAR" property="shopAddress" />
-    <result column="shop_img" jdbcType="VARCHAR" property="shopImg" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="shop_status" jdbcType="INTEGER" property="shopStatus" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, comp_id, shop_type, shop_url, shop_address, shop_img, create_time, create_id, 
-    update_time, shop_status
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShopExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_company_shop
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_company_shop
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from ums_company_shop
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShopExample">
-    delete from ums_company_shop
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_company_shop (comp_id, shop_type, shop_url, 
-      shop_address, shop_img, create_time, 
-      create_id, update_time, shop_status
-      )
-    values (#{compId,jdbcType=INTEGER}, #{shopType,jdbcType=VARCHAR}, #{shopUrl,jdbcType=VARCHAR}, 
-      #{shopAddress,jdbcType=VARCHAR}, #{shopImg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{shopStatus,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_company_shop
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="compId != null">
-        comp_id,
-      </if>
-      <if test="shopType != null">
-        shop_type,
-      </if>
-      <if test="shopUrl != null">
-        shop_url,
-      </if>
-      <if test="shopAddress != null">
-        shop_address,
-      </if>
-      <if test="shopImg != null">
-        shop_img,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="createId != null">
-        create_id,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="shopStatus != null">
-        shop_status,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="compId != null">
-        #{compId,jdbcType=INTEGER},
-      </if>
-      <if test="shopType != null">
-        #{shopType,jdbcType=VARCHAR},
-      </if>
-      <if test="shopUrl != null">
-        #{shopUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="shopAddress != null">
-        #{shopAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="shopImg != null">
-        #{shopImg,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shopStatus != null">
-        #{shopStatus,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShopExample" resultType="java.lang.Long">
-    select count(*) from ums_company_shop
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_company_shop
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.compId != null">
-        comp_id = #{record.compId,jdbcType=INTEGER},
-      </if>
-      <if test="record.shopType != null">
-        shop_type = #{record.shopType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.shopUrl != null">
-        shop_url = #{record.shopUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.shopAddress != null">
-        shop_address = #{record.shopAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="record.shopImg != null">
-        shop_img = #{record.shopImg,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.shopStatus != null">
-        shop_status = #{record.shopStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_company_shop
-    set id = #{record.id,jdbcType=INTEGER},
-      comp_id = #{record.compId,jdbcType=INTEGER},
-      shop_type = #{record.shopType,jdbcType=VARCHAR},
-      shop_url = #{record.shopUrl,jdbcType=VARCHAR},
-      shop_address = #{record.shopAddress,jdbcType=VARCHAR},
-      shop_img = #{record.shopImg,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      shop_status = #{record.shopStatus,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    update ums_company_shop
-    <set>
-      <if test="compId != null">
-        comp_id = #{compId,jdbcType=INTEGER},
-      </if>
-      <if test="shopType != null">
-        shop_type = #{shopType,jdbcType=VARCHAR},
-      </if>
-      <if test="shopUrl != null">
-        shop_url = #{shopUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="shopAddress != null">
-        shop_address = #{shopAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="shopImg != null">
-        shop_img = #{shopImg,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shopStatus != null">
-        shop_status = #{shopStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    update ums_company_shop
-    set comp_id = #{compId,jdbcType=INTEGER},
-      shop_type = #{shopType,jdbcType=VARCHAR},
-      shop_url = #{shopUrl,jdbcType=VARCHAR},
-      shop_address = #{shopAddress,jdbcType=VARCHAR},
-      shop_img = #{shopImg,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      shop_status = #{shopStatus,jdbcType=INTEGER}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsGrowthChangeHistoryMapper.xml

@@ -1,259 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsGrowthChangeHistoryMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsGrowthChangeHistory">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_id" jdbcType="BIGINT" property="memberId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="change_type" jdbcType="INTEGER" property="changeType" />
-    <result column="change_count" jdbcType="INTEGER" property="changeCount" />
-    <result column="operate_man" jdbcType="VARCHAR" property="operateMan" />
-    <result column="operate_note" jdbcType="VARCHAR" property="operateNote" />
-    <result column="source_type" jdbcType="INTEGER" property="sourceType" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_id, create_time, change_type, change_count, operate_man, operate_note, 
-    source_type
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsGrowthChangeHistoryExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_growth_change_history
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_growth_change_history
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_growth_change_history
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsGrowthChangeHistoryExample">
-    delete from ums_growth_change_history
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsGrowthChangeHistory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_growth_change_history (member_id, create_time, change_type, 
-      change_count, operate_man, operate_note, 
-      source_type)
-    values (#{memberId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{changeType,jdbcType=INTEGER}, 
-      #{changeCount,jdbcType=INTEGER}, #{operateMan,jdbcType=VARCHAR}, #{operateNote,jdbcType=VARCHAR}, 
-      #{sourceType,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsGrowthChangeHistory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_growth_change_history
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="changeType != null">
-        change_type,
-      </if>
-      <if test="changeCount != null">
-        change_count,
-      </if>
-      <if test="operateMan != null">
-        operate_man,
-      </if>
-      <if test="operateNote != null">
-        operate_note,
-      </if>
-      <if test="sourceType != null">
-        source_type,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="changeType != null">
-        #{changeType,jdbcType=INTEGER},
-      </if>
-      <if test="changeCount != null">
-        #{changeCount,jdbcType=INTEGER},
-      </if>
-      <if test="operateMan != null">
-        #{operateMan,jdbcType=VARCHAR},
-      </if>
-      <if test="operateNote != null">
-        #{operateNote,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceType != null">
-        #{sourceType,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsGrowthChangeHistoryExample" resultType="java.lang.Long">
-    select count(*) from ums_growth_change_history
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_growth_change_history
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberId != null">
-        member_id = #{record.memberId,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.changeType != null">
-        change_type = #{record.changeType,jdbcType=INTEGER},
-      </if>
-      <if test="record.changeCount != null">
-        change_count = #{record.changeCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.operateMan != null">
-        operate_man = #{record.operateMan,jdbcType=VARCHAR},
-      </if>
-      <if test="record.operateNote != null">
-        operate_note = #{record.operateNote,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sourceType != null">
-        source_type = #{record.sourceType,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_growth_change_history
-    set id = #{record.id,jdbcType=BIGINT},
-      member_id = #{record.memberId,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      change_type = #{record.changeType,jdbcType=INTEGER},
-      change_count = #{record.changeCount,jdbcType=INTEGER},
-      operate_man = #{record.operateMan,jdbcType=VARCHAR},
-      operate_note = #{record.operateNote,jdbcType=VARCHAR},
-      source_type = #{record.sourceType,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsGrowthChangeHistory">
-    update ums_growth_change_history
-    <set>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="changeType != null">
-        change_type = #{changeType,jdbcType=INTEGER},
-      </if>
-      <if test="changeCount != null">
-        change_count = #{changeCount,jdbcType=INTEGER},
-      </if>
-      <if test="operateMan != null">
-        operate_man = #{operateMan,jdbcType=VARCHAR},
-      </if>
-      <if test="operateNote != null">
-        operate_note = #{operateNote,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceType != null">
-        source_type = #{sourceType,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsGrowthChangeHistory">
-    update ums_growth_change_history
-    set member_id = #{memberId,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      change_type = #{changeType,jdbcType=INTEGER},
-      change_count = #{changeCount,jdbcType=INTEGER},
-      operate_man = #{operateMan,jdbcType=VARCHAR},
-      operate_note = #{operateNote,jdbcType=VARCHAR},
-      source_type = #{sourceType,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsIntegrationChangeHistoryMapper.xml

@@ -1,259 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsIntegrationChangeHistoryMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistory">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_id" jdbcType="BIGINT" property="memberId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="change_type" jdbcType="INTEGER" property="changeType" />
-    <result column="change_count" jdbcType="INTEGER" property="changeCount" />
-    <result column="operate_man" jdbcType="VARCHAR" property="operateMan" />
-    <result column="operate_note" jdbcType="VARCHAR" property="operateNote" />
-    <result column="source_type" jdbcType="INTEGER" property="sourceType" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_id, create_time, change_type, change_count, operate_man, operate_note, 
-    source_type
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistoryExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_integration_change_history
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_integration_change_history
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_integration_change_history
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistoryExample">
-    delete from ums_integration_change_history
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_integration_change_history (member_id, create_time, change_type, 
-      change_count, operate_man, operate_note, 
-      source_type)
-    values (#{memberId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{changeType,jdbcType=INTEGER}, 
-      #{changeCount,jdbcType=INTEGER}, #{operateMan,jdbcType=VARCHAR}, #{operateNote,jdbcType=VARCHAR}, 
-      #{sourceType,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_integration_change_history
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="changeType != null">
-        change_type,
-      </if>
-      <if test="changeCount != null">
-        change_count,
-      </if>
-      <if test="operateMan != null">
-        operate_man,
-      </if>
-      <if test="operateNote != null">
-        operate_note,
-      </if>
-      <if test="sourceType != null">
-        source_type,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="changeType != null">
-        #{changeType,jdbcType=INTEGER},
-      </if>
-      <if test="changeCount != null">
-        #{changeCount,jdbcType=INTEGER},
-      </if>
-      <if test="operateMan != null">
-        #{operateMan,jdbcType=VARCHAR},
-      </if>
-      <if test="operateNote != null">
-        #{operateNote,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceType != null">
-        #{sourceType,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistoryExample" resultType="java.lang.Long">
-    select count(*) from ums_integration_change_history
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_integration_change_history
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberId != null">
-        member_id = #{record.memberId,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.changeType != null">
-        change_type = #{record.changeType,jdbcType=INTEGER},
-      </if>
-      <if test="record.changeCount != null">
-        change_count = #{record.changeCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.operateMan != null">
-        operate_man = #{record.operateMan,jdbcType=VARCHAR},
-      </if>
-      <if test="record.operateNote != null">
-        operate_note = #{record.operateNote,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sourceType != null">
-        source_type = #{record.sourceType,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_integration_change_history
-    set id = #{record.id,jdbcType=BIGINT},
-      member_id = #{record.memberId,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      change_type = #{record.changeType,jdbcType=INTEGER},
-      change_count = #{record.changeCount,jdbcType=INTEGER},
-      operate_man = #{record.operateMan,jdbcType=VARCHAR},
-      operate_note = #{record.operateNote,jdbcType=VARCHAR},
-      source_type = #{record.sourceType,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistory">
-    update ums_integration_change_history
-    <set>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="changeType != null">
-        change_type = #{changeType,jdbcType=INTEGER},
-      </if>
-      <if test="changeCount != null">
-        change_count = #{changeCount,jdbcType=INTEGER},
-      </if>
-      <if test="operateMan != null">
-        operate_man = #{operateMan,jdbcType=VARCHAR},
-      </if>
-      <if test="operateNote != null">
-        operate_note = #{operateNote,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceType != null">
-        source_type = #{sourceType,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationChangeHistory">
-    update ums_integration_change_history
-    set member_id = #{memberId,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      change_type = #{changeType,jdbcType=INTEGER},
-      change_count = #{changeCount,jdbcType=INTEGER},
-      operate_man = #{operateMan,jdbcType=VARCHAR},
-      operate_note = #{operateNote,jdbcType=VARCHAR},
-      source_type = #{sourceType,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsIntegrationConsumeSettingMapper.xml

@@ -1,211 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsIntegrationConsumeSettingMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSetting">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="deduction_per_amount" jdbcType="INTEGER" property="deductionPerAmount" />
-    <result column="max_percent_per_order" jdbcType="INTEGER" property="maxPercentPerOrder" />
-    <result column="use_unit" jdbcType="INTEGER" property="useUnit" />
-    <result column="coupon_status" jdbcType="INTEGER" property="couponStatus" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, deduction_per_amount, max_percent_per_order, use_unit, coupon_status
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSettingExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_integration_consume_setting
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_integration_consume_setting
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_integration_consume_setting
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSettingExample">
-    delete from ums_integration_consume_setting
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSetting">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_integration_consume_setting (deduction_per_amount, max_percent_per_order, 
-      use_unit, coupon_status)
-    values (#{deductionPerAmount,jdbcType=INTEGER}, #{maxPercentPerOrder,jdbcType=INTEGER}, 
-      #{useUnit,jdbcType=INTEGER}, #{couponStatus,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSetting">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_integration_consume_setting
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="deductionPerAmount != null">
-        deduction_per_amount,
-      </if>
-      <if test="maxPercentPerOrder != null">
-        max_percent_per_order,
-      </if>
-      <if test="useUnit != null">
-        use_unit,
-      </if>
-      <if test="couponStatus != null">
-        coupon_status,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="deductionPerAmount != null">
-        #{deductionPerAmount,jdbcType=INTEGER},
-      </if>
-      <if test="maxPercentPerOrder != null">
-        #{maxPercentPerOrder,jdbcType=INTEGER},
-      </if>
-      <if test="useUnit != null">
-        #{useUnit,jdbcType=INTEGER},
-      </if>
-      <if test="couponStatus != null">
-        #{couponStatus,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSettingExample" resultType="java.lang.Long">
-    select count(*) from ums_integration_consume_setting
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_integration_consume_setting
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.deductionPerAmount != null">
-        deduction_per_amount = #{record.deductionPerAmount,jdbcType=INTEGER},
-      </if>
-      <if test="record.maxPercentPerOrder != null">
-        max_percent_per_order = #{record.maxPercentPerOrder,jdbcType=INTEGER},
-      </if>
-      <if test="record.useUnit != null">
-        use_unit = #{record.useUnit,jdbcType=INTEGER},
-      </if>
-      <if test="record.couponStatus != null">
-        coupon_status = #{record.couponStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_integration_consume_setting
-    set id = #{record.id,jdbcType=BIGINT},
-      deduction_per_amount = #{record.deductionPerAmount,jdbcType=INTEGER},
-      max_percent_per_order = #{record.maxPercentPerOrder,jdbcType=INTEGER},
-      use_unit = #{record.useUnit,jdbcType=INTEGER},
-      coupon_status = #{record.couponStatus,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSetting">
-    update ums_integration_consume_setting
-    <set>
-      <if test="deductionPerAmount != null">
-        deduction_per_amount = #{deductionPerAmount,jdbcType=INTEGER},
-      </if>
-      <if test="maxPercentPerOrder != null">
-        max_percent_per_order = #{maxPercentPerOrder,jdbcType=INTEGER},
-      </if>
-      <if test="useUnit != null">
-        use_unit = #{useUnit,jdbcType=INTEGER},
-      </if>
-      <if test="couponStatus != null">
-        coupon_status = #{couponStatus,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsIntegrationConsumeSetting">
-    update ums_integration_consume_setting
-    set deduction_per_amount = #{deductionPerAmount,jdbcType=INTEGER},
-      max_percent_per_order = #{maxPercentPerOrder,jdbcType=INTEGER},
-      use_unit = #{useUnit,jdbcType=INTEGER},
-      coupon_status = #{couponStatus,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberLevelMapper.xml

@@ -1,339 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberLevelMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberLevel">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="growth_point" jdbcType="INTEGER" property="growthPoint" />
-    <result column="default_status" jdbcType="INTEGER" property="defaultStatus" />
-    <result column="free_freight_point" jdbcType="DECIMAL" property="freeFreightPoint" />
-    <result column="comment_growth_point" jdbcType="INTEGER" property="commentGrowthPoint" />
-    <result column="priviledge_free_freight" jdbcType="INTEGER" property="priviledgeFreeFreight" />
-    <result column="priviledge_sign_in" jdbcType="INTEGER" property="priviledgeSignIn" />
-    <result column="priviledge_comment" jdbcType="INTEGER" property="priviledgeComment" />
-    <result column="priviledge_promotion" jdbcType="INTEGER" property="priviledgePromotion" />
-    <result column="priviledge_member_price" jdbcType="INTEGER" property="priviledgeMemberPrice" />
-    <result column="priviledge_birthday" jdbcType="INTEGER" property="priviledgeBirthday" />
-    <result column="note" jdbcType="VARCHAR" property="note" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, growth_point, default_status, free_freight_point, comment_growth_point, 
-    priviledge_free_freight, priviledge_sign_in, priviledge_comment, priviledge_promotion, 
-    priviledge_member_price, priviledge_birthday, note
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberLevelExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_level
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_level
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_level
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberLevelExample">
-    delete from ums_member_level
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberLevel">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_level (name, growth_point, default_status, 
-      free_freight_point, comment_growth_point, priviledge_free_freight, 
-      priviledge_sign_in, priviledge_comment, priviledge_promotion, 
-      priviledge_member_price, priviledge_birthday, 
-      note)
-    values (#{name,jdbcType=VARCHAR}, #{growthPoint,jdbcType=INTEGER}, #{defaultStatus,jdbcType=INTEGER}, 
-      #{freeFreightPoint,jdbcType=DECIMAL}, #{commentGrowthPoint,jdbcType=INTEGER}, #{priviledgeFreeFreight,jdbcType=INTEGER}, 
-      #{priviledgeSignIn,jdbcType=INTEGER}, #{priviledgeComment,jdbcType=INTEGER}, #{priviledgePromotion,jdbcType=INTEGER}, 
-      #{priviledgeMemberPrice,jdbcType=INTEGER}, #{priviledgeBirthday,jdbcType=INTEGER}, 
-      #{note,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberLevel">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_level
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="growthPoint != null">
-        growth_point,
-      </if>
-      <if test="defaultStatus != null">
-        default_status,
-      </if>
-      <if test="freeFreightPoint != null">
-        free_freight_point,
-      </if>
-      <if test="commentGrowthPoint != null">
-        comment_growth_point,
-      </if>
-      <if test="priviledgeFreeFreight != null">
-        priviledge_free_freight,
-      </if>
-      <if test="priviledgeSignIn != null">
-        priviledge_sign_in,
-      </if>
-      <if test="priviledgeComment != null">
-        priviledge_comment,
-      </if>
-      <if test="priviledgePromotion != null">
-        priviledge_promotion,
-      </if>
-      <if test="priviledgeMemberPrice != null">
-        priviledge_member_price,
-      </if>
-      <if test="priviledgeBirthday != null">
-        priviledge_birthday,
-      </if>
-      <if test="note != null">
-        note,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="growthPoint != null">
-        #{growthPoint,jdbcType=INTEGER},
-      </if>
-      <if test="defaultStatus != null">
-        #{defaultStatus,jdbcType=INTEGER},
-      </if>
-      <if test="freeFreightPoint != null">
-        #{freeFreightPoint,jdbcType=DECIMAL},
-      </if>
-      <if test="commentGrowthPoint != null">
-        #{commentGrowthPoint,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeFreeFreight != null">
-        #{priviledgeFreeFreight,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeSignIn != null">
-        #{priviledgeSignIn,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeComment != null">
-        #{priviledgeComment,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgePromotion != null">
-        #{priviledgePromotion,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeMemberPrice != null">
-        #{priviledgeMemberPrice,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeBirthday != null">
-        #{priviledgeBirthday,jdbcType=INTEGER},
-      </if>
-      <if test="note != null">
-        #{note,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberLevelExample" resultType="java.lang.Long">
-    select count(*) from ums_member_level
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_level
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.growthPoint != null">
-        growth_point = #{record.growthPoint,jdbcType=INTEGER},
-      </if>
-      <if test="record.defaultStatus != null">
-        default_status = #{record.defaultStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.freeFreightPoint != null">
-        free_freight_point = #{record.freeFreightPoint,jdbcType=DECIMAL},
-      </if>
-      <if test="record.commentGrowthPoint != null">
-        comment_growth_point = #{record.commentGrowthPoint,jdbcType=INTEGER},
-      </if>
-      <if test="record.priviledgeFreeFreight != null">
-        priviledge_free_freight = #{record.priviledgeFreeFreight,jdbcType=INTEGER},
-      </if>
-      <if test="record.priviledgeSignIn != null">
-        priviledge_sign_in = #{record.priviledgeSignIn,jdbcType=INTEGER},
-      </if>
-      <if test="record.priviledgeComment != null">
-        priviledge_comment = #{record.priviledgeComment,jdbcType=INTEGER},
-      </if>
-      <if test="record.priviledgePromotion != null">
-        priviledge_promotion = #{record.priviledgePromotion,jdbcType=INTEGER},
-      </if>
-      <if test="record.priviledgeMemberPrice != null">
-        priviledge_member_price = #{record.priviledgeMemberPrice,jdbcType=INTEGER},
-      </if>
-      <if test="record.priviledgeBirthday != null">
-        priviledge_birthday = #{record.priviledgeBirthday,jdbcType=INTEGER},
-      </if>
-      <if test="record.note != null">
-        note = #{record.note,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_level
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      growth_point = #{record.growthPoint,jdbcType=INTEGER},
-      default_status = #{record.defaultStatus,jdbcType=INTEGER},
-      free_freight_point = #{record.freeFreightPoint,jdbcType=DECIMAL},
-      comment_growth_point = #{record.commentGrowthPoint,jdbcType=INTEGER},
-      priviledge_free_freight = #{record.priviledgeFreeFreight,jdbcType=INTEGER},
-      priviledge_sign_in = #{record.priviledgeSignIn,jdbcType=INTEGER},
-      priviledge_comment = #{record.priviledgeComment,jdbcType=INTEGER},
-      priviledge_promotion = #{record.priviledgePromotion,jdbcType=INTEGER},
-      priviledge_member_price = #{record.priviledgeMemberPrice,jdbcType=INTEGER},
-      priviledge_birthday = #{record.priviledgeBirthday,jdbcType=INTEGER},
-      note = #{record.note,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberLevel">
-    update ums_member_level
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="growthPoint != null">
-        growth_point = #{growthPoint,jdbcType=INTEGER},
-      </if>
-      <if test="defaultStatus != null">
-        default_status = #{defaultStatus,jdbcType=INTEGER},
-      </if>
-      <if test="freeFreightPoint != null">
-        free_freight_point = #{freeFreightPoint,jdbcType=DECIMAL},
-      </if>
-      <if test="commentGrowthPoint != null">
-        comment_growth_point = #{commentGrowthPoint,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeFreeFreight != null">
-        priviledge_free_freight = #{priviledgeFreeFreight,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeSignIn != null">
-        priviledge_sign_in = #{priviledgeSignIn,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeComment != null">
-        priviledge_comment = #{priviledgeComment,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgePromotion != null">
-        priviledge_promotion = #{priviledgePromotion,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeMemberPrice != null">
-        priviledge_member_price = #{priviledgeMemberPrice,jdbcType=INTEGER},
-      </if>
-      <if test="priviledgeBirthday != null">
-        priviledge_birthday = #{priviledgeBirthday,jdbcType=INTEGER},
-      </if>
-      <if test="note != null">
-        note = #{note,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberLevel">
-    update ums_member_level
-    set name = #{name,jdbcType=VARCHAR},
-      growth_point = #{growthPoint,jdbcType=INTEGER},
-      default_status = #{defaultStatus,jdbcType=INTEGER},
-      free_freight_point = #{freeFreightPoint,jdbcType=DECIMAL},
-      comment_growth_point = #{commentGrowthPoint,jdbcType=INTEGER},
-      priviledge_free_freight = #{priviledgeFreeFreight,jdbcType=INTEGER},
-      priviledge_sign_in = #{priviledgeSignIn,jdbcType=INTEGER},
-      priviledge_comment = #{priviledgeComment,jdbcType=INTEGER},
-      priviledge_promotion = #{priviledgePromotion,jdbcType=INTEGER},
-      priviledge_member_price = #{priviledgeMemberPrice,jdbcType=INTEGER},
-      priviledge_birthday = #{priviledgeBirthday,jdbcType=INTEGER},
-      note = #{note,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberLoginLogMapper.xml

@@ -1,243 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberLoginLogMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberLoginLog">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_id" jdbcType="BIGINT" property="memberId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="ip" jdbcType="VARCHAR" property="ip" />
-    <result column="city" jdbcType="VARCHAR" property="city" />
-    <result column="login_type" jdbcType="INTEGER" property="loginType" />
-    <result column="province" jdbcType="VARCHAR" property="province" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_id, create_time, ip, city, login_type, province
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberLoginLogExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_login_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_login_log
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_login_log
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberLoginLogExample">
-    delete from ums_member_login_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberLoginLog">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_login_log (member_id, create_time, ip, 
-      city, login_type, province
-      )
-    values (#{memberId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{ip,jdbcType=VARCHAR}, 
-      #{city,jdbcType=VARCHAR}, #{loginType,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberLoginLog">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_login_log
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="ip != null">
-        ip,
-      </if>
-      <if test="city != null">
-        city,
-      </if>
-      <if test="loginType != null">
-        login_type,
-      </if>
-      <if test="province != null">
-        province,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ip != null">
-        #{ip,jdbcType=VARCHAR},
-      </if>
-      <if test="city != null">
-        #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="loginType != null">
-        #{loginType,jdbcType=INTEGER},
-      </if>
-      <if test="province != null">
-        #{province,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberLoginLogExample" resultType="java.lang.Long">
-    select count(*) from ums_member_login_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_login_log
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberId != null">
-        member_id = #{record.memberId,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.ip != null">
-        ip = #{record.ip,jdbcType=VARCHAR},
-      </if>
-      <if test="record.city != null">
-        city = #{record.city,jdbcType=VARCHAR},
-      </if>
-      <if test="record.loginType != null">
-        login_type = #{record.loginType,jdbcType=INTEGER},
-      </if>
-      <if test="record.province != null">
-        province = #{record.province,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_login_log
-    set id = #{record.id,jdbcType=BIGINT},
-      member_id = #{record.memberId,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      ip = #{record.ip,jdbcType=VARCHAR},
-      city = #{record.city,jdbcType=VARCHAR},
-      login_type = #{record.loginType,jdbcType=INTEGER},
-      province = #{record.province,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberLoginLog">
-    update ums_member_login_log
-    <set>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ip != null">
-        ip = #{ip,jdbcType=VARCHAR},
-      </if>
-      <if test="city != null">
-        city = #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="loginType != null">
-        login_type = #{loginType,jdbcType=INTEGER},
-      </if>
-      <if test="province != null">
-        province = #{province,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberLoginLog">
-    update ums_member_login_log
-    set member_id = #{memberId,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      ip = #{ip,jdbcType=VARCHAR},
-      city = #{city,jdbcType=VARCHAR},
-      login_type = #{loginType,jdbcType=INTEGER},
-      province = #{province,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberMapper.xml

@@ -1,431 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMember">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_level_id" jdbcType="BIGINT" property="memberLevelId" />
-    <result column="username" jdbcType="VARCHAR" property="username" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="nickname" jdbcType="VARCHAR" property="nickname" />
-    <result column="phone" jdbcType="VARCHAR" property="phone" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="gender" jdbcType="INTEGER" property="gender" />
-    <result column="birthday" jdbcType="DATE" property="birthday" />
-    <result column="city" jdbcType="VARCHAR" property="city" />
-    <result column="job" jdbcType="VARCHAR" property="job" />
-    <result column="personalized_signature" jdbcType="VARCHAR" property="personalizedSignature" />
-    <result column="source_type" jdbcType="INTEGER" property="sourceType" />
-    <result column="integration" jdbcType="INTEGER" property="integration" />
-    <result column="growth" jdbcType="INTEGER" property="growth" />
-    <result column="luckey_count" jdbcType="INTEGER" property="luckeyCount" />
-    <result column="history_integration" jdbcType="INTEGER" property="historyIntegration" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_level_id, username, password, nickname, phone, status, create_time, icon, 
-    gender, birthday, city, job, personalized_signature, source_type, integration, growth, 
-    luckey_count, history_integration
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberExample">
-    delete from ums_member
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMember">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member (member_level_id, username, password, 
-      nickname, phone, status, 
-      create_time, icon, gender, 
-      birthday, city, job, personalized_signature, 
-      source_type, integration, growth, 
-      luckey_count, history_integration)
-    values (#{memberLevelId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
-      #{nickname,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{icon,jdbcType=VARCHAR}, #{gender,jdbcType=INTEGER}, 
-      #{birthday,jdbcType=DATE}, #{city,jdbcType=VARCHAR}, #{job,jdbcType=VARCHAR}, #{personalizedSignature,jdbcType=VARCHAR}, 
-      #{sourceType,jdbcType=INTEGER}, #{integration,jdbcType=INTEGER}, #{growth,jdbcType=INTEGER}, 
-      #{luckeyCount,jdbcType=INTEGER}, #{historyIntegration,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMember">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberLevelId != null">
-        member_level_id,
-      </if>
-      <if test="username != null">
-        username,
-      </if>
-      <if test="password != null">
-        password,
-      </if>
-      <if test="nickname != null">
-        nickname,
-      </if>
-      <if test="phone != null">
-        phone,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="gender != null">
-        gender,
-      </if>
-      <if test="birthday != null">
-        birthday,
-      </if>
-      <if test="city != null">
-        city,
-      </if>
-      <if test="job != null">
-        job,
-      </if>
-      <if test="personalizedSignature != null">
-        personalized_signature,
-      </if>
-      <if test="sourceType != null">
-        source_type,
-      </if>
-      <if test="integration != null">
-        integration,
-      </if>
-      <if test="growth != null">
-        growth,
-      </if>
-      <if test="luckeyCount != null">
-        luckey_count,
-      </if>
-      <if test="historyIntegration != null">
-        history_integration,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberLevelId != null">
-        #{memberLevelId,jdbcType=BIGINT},
-      </if>
-      <if test="username != null">
-        #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null">
-        #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="phone != null">
-        #{phone,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="gender != null">
-        #{gender,jdbcType=INTEGER},
-      </if>
-      <if test="birthday != null">
-        #{birthday,jdbcType=DATE},
-      </if>
-      <if test="city != null">
-        #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="job != null">
-        #{job,jdbcType=VARCHAR},
-      </if>
-      <if test="personalizedSignature != null">
-        #{personalizedSignature,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceType != null">
-        #{sourceType,jdbcType=INTEGER},
-      </if>
-      <if test="integration != null">
-        #{integration,jdbcType=INTEGER},
-      </if>
-      <if test="growth != null">
-        #{growth,jdbcType=INTEGER},
-      </if>
-      <if test="luckeyCount != null">
-        #{luckeyCount,jdbcType=INTEGER},
-      </if>
-      <if test="historyIntegration != null">
-        #{historyIntegration,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberExample" resultType="java.lang.Long">
-    select count(*) from ums_member
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberLevelId != null">
-        member_level_id = #{record.memberLevelId,jdbcType=BIGINT},
-      </if>
-      <if test="record.username != null">
-        username = #{record.username,jdbcType=VARCHAR},
-      </if>
-      <if test="record.password != null">
-        password = #{record.password,jdbcType=VARCHAR},
-      </if>
-      <if test="record.nickname != null">
-        nickname = #{record.nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.phone != null">
-        phone = #{record.phone,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.gender != null">
-        gender = #{record.gender,jdbcType=INTEGER},
-      </if>
-      <if test="record.birthday != null">
-        birthday = #{record.birthday,jdbcType=DATE},
-      </if>
-      <if test="record.city != null">
-        city = #{record.city,jdbcType=VARCHAR},
-      </if>
-      <if test="record.job != null">
-        job = #{record.job,jdbcType=VARCHAR},
-      </if>
-      <if test="record.personalizedSignature != null">
-        personalized_signature = #{record.personalizedSignature,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sourceType != null">
-        source_type = #{record.sourceType,jdbcType=INTEGER},
-      </if>
-      <if test="record.integration != null">
-        integration = #{record.integration,jdbcType=INTEGER},
-      </if>
-      <if test="record.growth != null">
-        growth = #{record.growth,jdbcType=INTEGER},
-      </if>
-      <if test="record.luckeyCount != null">
-        luckey_count = #{record.luckeyCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.historyIntegration != null">
-        history_integration = #{record.historyIntegration,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member
-    set id = #{record.id,jdbcType=BIGINT},
-      member_level_id = #{record.memberLevelId,jdbcType=BIGINT},
-      username = #{record.username,jdbcType=VARCHAR},
-      password = #{record.password,jdbcType=VARCHAR},
-      nickname = #{record.nickname,jdbcType=VARCHAR},
-      phone = #{record.phone,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      gender = #{record.gender,jdbcType=INTEGER},
-      birthday = #{record.birthday,jdbcType=DATE},
-      city = #{record.city,jdbcType=VARCHAR},
-      job = #{record.job,jdbcType=VARCHAR},
-      personalized_signature = #{record.personalizedSignature,jdbcType=VARCHAR},
-      source_type = #{record.sourceType,jdbcType=INTEGER},
-      integration = #{record.integration,jdbcType=INTEGER},
-      growth = #{record.growth,jdbcType=INTEGER},
-      luckey_count = #{record.luckeyCount,jdbcType=INTEGER},
-      history_integration = #{record.historyIntegration,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMember">
-    update ums_member
-    <set>
-      <if test="memberLevelId != null">
-        member_level_id = #{memberLevelId,jdbcType=BIGINT},
-      </if>
-      <if test="username != null">
-        username = #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null">
-        nickname = #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="phone != null">
-        phone = #{phone,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="gender != null">
-        gender = #{gender,jdbcType=INTEGER},
-      </if>
-      <if test="birthday != null">
-        birthday = #{birthday,jdbcType=DATE},
-      </if>
-      <if test="city != null">
-        city = #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="job != null">
-        job = #{job,jdbcType=VARCHAR},
-      </if>
-      <if test="personalizedSignature != null">
-        personalized_signature = #{personalizedSignature,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceType != null">
-        source_type = #{sourceType,jdbcType=INTEGER},
-      </if>
-      <if test="integration != null">
-        integration = #{integration,jdbcType=INTEGER},
-      </if>
-      <if test="growth != null">
-        growth = #{growth,jdbcType=INTEGER},
-      </if>
-      <if test="luckeyCount != null">
-        luckey_count = #{luckeyCount,jdbcType=INTEGER},
-      </if>
-      <if test="historyIntegration != null">
-        history_integration = #{historyIntegration,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMember">
-    update ums_member
-    set member_level_id = #{memberLevelId,jdbcType=BIGINT},
-      username = #{username,jdbcType=VARCHAR},
-      password = #{password,jdbcType=VARCHAR},
-      nickname = #{nickname,jdbcType=VARCHAR},
-      phone = #{phone,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      icon = #{icon,jdbcType=VARCHAR},
-      gender = #{gender,jdbcType=INTEGER},
-      birthday = #{birthday,jdbcType=DATE},
-      city = #{city,jdbcType=VARCHAR},
-      job = #{job,jdbcType=VARCHAR},
-      personalized_signature = #{personalizedSignature,jdbcType=VARCHAR},
-      source_type = #{sourceType,jdbcType=INTEGER},
-      integration = #{integration,jdbcType=INTEGER},
-      growth = #{growth,jdbcType=INTEGER},
-      luckey_count = #{luckeyCount,jdbcType=INTEGER},
-      history_integration = #{historyIntegration,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberMemberTagRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberMemberTagRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_id" jdbcType="BIGINT" property="memberId" />
-    <result column="tag_id" jdbcType="BIGINT" property="tagId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_id, tag_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_member_tag_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_member_tag_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_member_tag_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelationExample">
-    delete from ums_member_member_tag_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_member_tag_relation (member_id, tag_id)
-    values (#{memberId,jdbcType=BIGINT}, #{tagId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_member_tag_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="tagId != null">
-        tag_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="tagId != null">
-        #{tagId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelationExample" resultType="java.lang.Long">
-    select count(*) from ums_member_member_tag_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_member_tag_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberId != null">
-        member_id = #{record.memberId,jdbcType=BIGINT},
-      </if>
-      <if test="record.tagId != null">
-        tag_id = #{record.tagId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_member_tag_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      member_id = #{record.memberId,jdbcType=BIGINT},
-      tag_id = #{record.tagId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelation">
-    update ums_member_member_tag_relation
-    <set>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="tagId != null">
-        tag_id = #{tagId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberMemberTagRelation">
-    update ums_member_member_tag_relation
-    set member_id = #{memberId,jdbcType=BIGINT},
-      tag_id = #{tagId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberProductCategoryRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberProductCategoryRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_id" jdbcType="BIGINT" property="memberId" />
-    <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_id, product_category_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_product_category_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_product_category_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_product_category_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelationExample">
-    delete from ums_member_product_category_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_product_category_relation (member_id, product_category_id)
-    values (#{memberId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_product_category_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="productCategoryId != null">
-        product_category_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="productCategoryId != null">
-        #{productCategoryId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelationExample" resultType="java.lang.Long">
-    select count(*) from ums_member_product_category_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_product_category_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberId != null">
-        member_id = #{record.memberId,jdbcType=BIGINT},
-      </if>
-      <if test="record.productCategoryId != null">
-        product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_product_category_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      member_id = #{record.memberId,jdbcType=BIGINT},
-      product_category_id = #{record.productCategoryId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelation">
-    update ums_member_product_category_relation
-    <set>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="productCategoryId != null">
-        product_category_id = #{productCategoryId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberProductCategoryRelation">
-    update ums_member_product_category_relation
-    set member_id = #{memberId,jdbcType=BIGINT},
-      product_category_id = #{productCategoryId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberReceiveAddressMapper.xml

@@ -1,291 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberReceiveAddressMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberReceiveAddress">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_id" jdbcType="BIGINT" property="memberId" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="phone_number" jdbcType="VARCHAR" property="phoneNumber" />
-    <result column="default_status" jdbcType="INTEGER" property="defaultStatus" />
-    <result column="post_code" jdbcType="VARCHAR" property="postCode" />
-    <result column="province" jdbcType="VARCHAR" property="province" />
-    <result column="city" jdbcType="VARCHAR" property="city" />
-    <result column="region" jdbcType="VARCHAR" property="region" />
-    <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_id, name, phone_number, default_status, post_code, province, city, region, 
-    detail_address
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberReceiveAddressExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_receive_address
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_receive_address
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_receive_address
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberReceiveAddressExample">
-    delete from ums_member_receive_address
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberReceiveAddress">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_receive_address (member_id, name, phone_number, 
-      default_status, post_code, province, 
-      city, region, detail_address
-      )
-    values (#{memberId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{phoneNumber,jdbcType=VARCHAR}, 
-      #{defaultStatus,jdbcType=INTEGER}, #{postCode,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, 
-      #{city,jdbcType=VARCHAR}, #{region,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberReceiveAddress">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_receive_address
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="phoneNumber != null">
-        phone_number,
-      </if>
-      <if test="defaultStatus != null">
-        default_status,
-      </if>
-      <if test="postCode != null">
-        post_code,
-      </if>
-      <if test="province != null">
-        province,
-      </if>
-      <if test="city != null">
-        city,
-      </if>
-      <if test="region != null">
-        region,
-      </if>
-      <if test="detailAddress != null">
-        detail_address,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="phoneNumber != null">
-        #{phoneNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="defaultStatus != null">
-        #{defaultStatus,jdbcType=INTEGER},
-      </if>
-      <if test="postCode != null">
-        #{postCode,jdbcType=VARCHAR},
-      </if>
-      <if test="province != null">
-        #{province,jdbcType=VARCHAR},
-      </if>
-      <if test="city != null">
-        #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="region != null">
-        #{region,jdbcType=VARCHAR},
-      </if>
-      <if test="detailAddress != null">
-        #{detailAddress,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberReceiveAddressExample" resultType="java.lang.Long">
-    select count(*) from ums_member_receive_address
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_receive_address
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberId != null">
-        member_id = #{record.memberId,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.phoneNumber != null">
-        phone_number = #{record.phoneNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.defaultStatus != null">
-        default_status = #{record.defaultStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.postCode != null">
-        post_code = #{record.postCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.province != null">
-        province = #{record.province,jdbcType=VARCHAR},
-      </if>
-      <if test="record.city != null">
-        city = #{record.city,jdbcType=VARCHAR},
-      </if>
-      <if test="record.region != null">
-        region = #{record.region,jdbcType=VARCHAR},
-      </if>
-      <if test="record.detailAddress != null">
-        detail_address = #{record.detailAddress,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_receive_address
-    set id = #{record.id,jdbcType=BIGINT},
-      member_id = #{record.memberId,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      phone_number = #{record.phoneNumber,jdbcType=VARCHAR},
-      default_status = #{record.defaultStatus,jdbcType=INTEGER},
-      post_code = #{record.postCode,jdbcType=VARCHAR},
-      province = #{record.province,jdbcType=VARCHAR},
-      city = #{record.city,jdbcType=VARCHAR},
-      region = #{record.region,jdbcType=VARCHAR},
-      detail_address = #{record.detailAddress,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberReceiveAddress">
-    update ums_member_receive_address
-    <set>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="phoneNumber != null">
-        phone_number = #{phoneNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="defaultStatus != null">
-        default_status = #{defaultStatus,jdbcType=INTEGER},
-      </if>
-      <if test="postCode != null">
-        post_code = #{postCode,jdbcType=VARCHAR},
-      </if>
-      <if test="province != null">
-        province = #{province,jdbcType=VARCHAR},
-      </if>
-      <if test="city != null">
-        city = #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="region != null">
-        region = #{region,jdbcType=VARCHAR},
-      </if>
-      <if test="detailAddress != null">
-        detail_address = #{detailAddress,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberReceiveAddress">
-    update ums_member_receive_address
-    set member_id = #{memberId,jdbcType=BIGINT},
-      name = #{name,jdbcType=VARCHAR},
-      phone_number = #{phoneNumber,jdbcType=VARCHAR},
-      default_status = #{defaultStatus,jdbcType=INTEGER},
-      post_code = #{postCode,jdbcType=VARCHAR},
-      province = #{province,jdbcType=VARCHAR},
-      city = #{city,jdbcType=VARCHAR},
-      region = #{region,jdbcType=VARCHAR},
-      detail_address = #{detailAddress,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberRuleSettingMapper.xml

@@ -1,244 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberRuleSettingMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberRuleSetting">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="continue_sign_day" jdbcType="INTEGER" property="continueSignDay" />
-    <result column="continue_sign_point" jdbcType="INTEGER" property="continueSignPoint" />
-    <result column="consume_per_point" jdbcType="DECIMAL" property="consumePerPoint" />
-    <result column="low_order_amount" jdbcType="DECIMAL" property="lowOrderAmount" />
-    <result column="max_point_per_order" jdbcType="INTEGER" property="maxPointPerOrder" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, continue_sign_day, continue_sign_point, consume_per_point, low_order_amount, 
-    max_point_per_order, type
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberRuleSettingExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_rule_setting
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_rule_setting
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_rule_setting
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberRuleSettingExample">
-    delete from ums_member_rule_setting
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberRuleSetting">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_rule_setting (continue_sign_day, continue_sign_point, 
-      consume_per_point, low_order_amount, max_point_per_order, 
-      type)
-    values (#{continueSignDay,jdbcType=INTEGER}, #{continueSignPoint,jdbcType=INTEGER}, 
-      #{consumePerPoint,jdbcType=DECIMAL}, #{lowOrderAmount,jdbcType=DECIMAL}, #{maxPointPerOrder,jdbcType=INTEGER}, 
-      #{type,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberRuleSetting">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_rule_setting
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="continueSignDay != null">
-        continue_sign_day,
-      </if>
-      <if test="continueSignPoint != null">
-        continue_sign_point,
-      </if>
-      <if test="consumePerPoint != null">
-        consume_per_point,
-      </if>
-      <if test="lowOrderAmount != null">
-        low_order_amount,
-      </if>
-      <if test="maxPointPerOrder != null">
-        max_point_per_order,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="continueSignDay != null">
-        #{continueSignDay,jdbcType=INTEGER},
-      </if>
-      <if test="continueSignPoint != null">
-        #{continueSignPoint,jdbcType=INTEGER},
-      </if>
-      <if test="consumePerPoint != null">
-        #{consumePerPoint,jdbcType=DECIMAL},
-      </if>
-      <if test="lowOrderAmount != null">
-        #{lowOrderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="maxPointPerOrder != null">
-        #{maxPointPerOrder,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberRuleSettingExample" resultType="java.lang.Long">
-    select count(*) from ums_member_rule_setting
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_rule_setting
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.continueSignDay != null">
-        continue_sign_day = #{record.continueSignDay,jdbcType=INTEGER},
-      </if>
-      <if test="record.continueSignPoint != null">
-        continue_sign_point = #{record.continueSignPoint,jdbcType=INTEGER},
-      </if>
-      <if test="record.consumePerPoint != null">
-        consume_per_point = #{record.consumePerPoint,jdbcType=DECIMAL},
-      </if>
-      <if test="record.lowOrderAmount != null">
-        low_order_amount = #{record.lowOrderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.maxPointPerOrder != null">
-        max_point_per_order = #{record.maxPointPerOrder,jdbcType=INTEGER},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_rule_setting
-    set id = #{record.id,jdbcType=BIGINT},
-      continue_sign_day = #{record.continueSignDay,jdbcType=INTEGER},
-      continue_sign_point = #{record.continueSignPoint,jdbcType=INTEGER},
-      consume_per_point = #{record.consumePerPoint,jdbcType=DECIMAL},
-      low_order_amount = #{record.lowOrderAmount,jdbcType=DECIMAL},
-      max_point_per_order = #{record.maxPointPerOrder,jdbcType=INTEGER},
-      type = #{record.type,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberRuleSetting">
-    update ums_member_rule_setting
-    <set>
-      <if test="continueSignDay != null">
-        continue_sign_day = #{continueSignDay,jdbcType=INTEGER},
-      </if>
-      <if test="continueSignPoint != null">
-        continue_sign_point = #{continueSignPoint,jdbcType=INTEGER},
-      </if>
-      <if test="consumePerPoint != null">
-        consume_per_point = #{consumePerPoint,jdbcType=DECIMAL},
-      </if>
-      <if test="lowOrderAmount != null">
-        low_order_amount = #{lowOrderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="maxPointPerOrder != null">
-        max_point_per_order = #{maxPointPerOrder,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberRuleSetting">
-    update ums_member_rule_setting
-    set continue_sign_day = #{continueSignDay,jdbcType=INTEGER},
-      continue_sign_point = #{continueSignPoint,jdbcType=INTEGER},
-      consume_per_point = #{consumePerPoint,jdbcType=DECIMAL},
-      low_order_amount = #{lowOrderAmount,jdbcType=DECIMAL},
-      max_point_per_order = #{maxPointPerOrder,jdbcType=INTEGER},
-      type = #{type,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberStatisticsInfoMapper.xml

@@ -1,386 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberStatisticsInfoMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfo">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="member_id" jdbcType="BIGINT" property="memberId" />
-    <result column="consume_amount" jdbcType="DECIMAL" property="consumeAmount" />
-    <result column="order_count" jdbcType="INTEGER" property="orderCount" />
-    <result column="coupon_count" jdbcType="INTEGER" property="couponCount" />
-    <result column="comment_count" jdbcType="INTEGER" property="commentCount" />
-    <result column="return_order_count" jdbcType="INTEGER" property="returnOrderCount" />
-    <result column="login_count" jdbcType="INTEGER" property="loginCount" />
-    <result column="attend_count" jdbcType="INTEGER" property="attendCount" />
-    <result column="fans_count" jdbcType="INTEGER" property="fansCount" />
-    <result column="collect_product_count" jdbcType="INTEGER" property="collectProductCount" />
-    <result column="collect_subject_count" jdbcType="INTEGER" property="collectSubjectCount" />
-    <result column="collect_topic_count" jdbcType="INTEGER" property="collectTopicCount" />
-    <result column="collect_comment_count" jdbcType="INTEGER" property="collectCommentCount" />
-    <result column="invite_friend_count" jdbcType="INTEGER" property="inviteFriendCount" />
-    <result column="recent_order_time" jdbcType="TIMESTAMP" property="recentOrderTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, member_id, consume_amount, order_count, coupon_count, comment_count, return_order_count, 
-    login_count, attend_count, fans_count, collect_product_count, collect_subject_count, 
-    collect_topic_count, collect_comment_count, invite_friend_count, recent_order_time
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfoExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_statistics_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_statistics_info
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_statistics_info
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfoExample">
-    delete from ums_member_statistics_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfo">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_statistics_info (member_id, consume_amount, order_count, 
-      coupon_count, comment_count, return_order_count, 
-      login_count, attend_count, fans_count, 
-      collect_product_count, collect_subject_count, 
-      collect_topic_count, collect_comment_count, 
-      invite_friend_count, recent_order_time)
-    values (#{memberId,jdbcType=BIGINT}, #{consumeAmount,jdbcType=DECIMAL}, #{orderCount,jdbcType=INTEGER}, 
-      #{couponCount,jdbcType=INTEGER}, #{commentCount,jdbcType=INTEGER}, #{returnOrderCount,jdbcType=INTEGER}, 
-      #{loginCount,jdbcType=INTEGER}, #{attendCount,jdbcType=INTEGER}, #{fansCount,jdbcType=INTEGER}, 
-      #{collectProductCount,jdbcType=INTEGER}, #{collectSubjectCount,jdbcType=INTEGER}, 
-      #{collectTopicCount,jdbcType=INTEGER}, #{collectCommentCount,jdbcType=INTEGER}, 
-      #{inviteFriendCount,jdbcType=INTEGER}, #{recentOrderTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfo">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_statistics_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="consumeAmount != null">
-        consume_amount,
-      </if>
-      <if test="orderCount != null">
-        order_count,
-      </if>
-      <if test="couponCount != null">
-        coupon_count,
-      </if>
-      <if test="commentCount != null">
-        comment_count,
-      </if>
-      <if test="returnOrderCount != null">
-        return_order_count,
-      </if>
-      <if test="loginCount != null">
-        login_count,
-      </if>
-      <if test="attendCount != null">
-        attend_count,
-      </if>
-      <if test="fansCount != null">
-        fans_count,
-      </if>
-      <if test="collectProductCount != null">
-        collect_product_count,
-      </if>
-      <if test="collectSubjectCount != null">
-        collect_subject_count,
-      </if>
-      <if test="collectTopicCount != null">
-        collect_topic_count,
-      </if>
-      <if test="collectCommentCount != null">
-        collect_comment_count,
-      </if>
-      <if test="inviteFriendCount != null">
-        invite_friend_count,
-      </if>
-      <if test="recentOrderTime != null">
-        recent_order_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="memberId != null">
-        #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="consumeAmount != null">
-        #{consumeAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="orderCount != null">
-        #{orderCount,jdbcType=INTEGER},
-      </if>
-      <if test="couponCount != null">
-        #{couponCount,jdbcType=INTEGER},
-      </if>
-      <if test="commentCount != null">
-        #{commentCount,jdbcType=INTEGER},
-      </if>
-      <if test="returnOrderCount != null">
-        #{returnOrderCount,jdbcType=INTEGER},
-      </if>
-      <if test="loginCount != null">
-        #{loginCount,jdbcType=INTEGER},
-      </if>
-      <if test="attendCount != null">
-        #{attendCount,jdbcType=INTEGER},
-      </if>
-      <if test="fansCount != null">
-        #{fansCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectProductCount != null">
-        #{collectProductCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectSubjectCount != null">
-        #{collectSubjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectTopicCount != null">
-        #{collectTopicCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectCommentCount != null">
-        #{collectCommentCount,jdbcType=INTEGER},
-      </if>
-      <if test="inviteFriendCount != null">
-        #{inviteFriendCount,jdbcType=INTEGER},
-      </if>
-      <if test="recentOrderTime != null">
-        #{recentOrderTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfoExample" resultType="java.lang.Long">
-    select count(*) from ums_member_statistics_info
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_statistics_info
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.memberId != null">
-        member_id = #{record.memberId,jdbcType=BIGINT},
-      </if>
-      <if test="record.consumeAmount != null">
-        consume_amount = #{record.consumeAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.orderCount != null">
-        order_count = #{record.orderCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.couponCount != null">
-        coupon_count = #{record.couponCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.commentCount != null">
-        comment_count = #{record.commentCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.returnOrderCount != null">
-        return_order_count = #{record.returnOrderCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.loginCount != null">
-        login_count = #{record.loginCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.attendCount != null">
-        attend_count = #{record.attendCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.fansCount != null">
-        fans_count = #{record.fansCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.collectProductCount != null">
-        collect_product_count = #{record.collectProductCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.collectSubjectCount != null">
-        collect_subject_count = #{record.collectSubjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.collectTopicCount != null">
-        collect_topic_count = #{record.collectTopicCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.collectCommentCount != null">
-        collect_comment_count = #{record.collectCommentCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.inviteFriendCount != null">
-        invite_friend_count = #{record.inviteFriendCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.recentOrderTime != null">
-        recent_order_time = #{record.recentOrderTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_statistics_info
-    set id = #{record.id,jdbcType=BIGINT},
-      member_id = #{record.memberId,jdbcType=BIGINT},
-      consume_amount = #{record.consumeAmount,jdbcType=DECIMAL},
-      order_count = #{record.orderCount,jdbcType=INTEGER},
-      coupon_count = #{record.couponCount,jdbcType=INTEGER},
-      comment_count = #{record.commentCount,jdbcType=INTEGER},
-      return_order_count = #{record.returnOrderCount,jdbcType=INTEGER},
-      login_count = #{record.loginCount,jdbcType=INTEGER},
-      attend_count = #{record.attendCount,jdbcType=INTEGER},
-      fans_count = #{record.fansCount,jdbcType=INTEGER},
-      collect_product_count = #{record.collectProductCount,jdbcType=INTEGER},
-      collect_subject_count = #{record.collectSubjectCount,jdbcType=INTEGER},
-      collect_topic_count = #{record.collectTopicCount,jdbcType=INTEGER},
-      collect_comment_count = #{record.collectCommentCount,jdbcType=INTEGER},
-      invite_friend_count = #{record.inviteFriendCount,jdbcType=INTEGER},
-      recent_order_time = #{record.recentOrderTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfo">
-    update ums_member_statistics_info
-    <set>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=BIGINT},
-      </if>
-      <if test="consumeAmount != null">
-        consume_amount = #{consumeAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="orderCount != null">
-        order_count = #{orderCount,jdbcType=INTEGER},
-      </if>
-      <if test="couponCount != null">
-        coupon_count = #{couponCount,jdbcType=INTEGER},
-      </if>
-      <if test="commentCount != null">
-        comment_count = #{commentCount,jdbcType=INTEGER},
-      </if>
-      <if test="returnOrderCount != null">
-        return_order_count = #{returnOrderCount,jdbcType=INTEGER},
-      </if>
-      <if test="loginCount != null">
-        login_count = #{loginCount,jdbcType=INTEGER},
-      </if>
-      <if test="attendCount != null">
-        attend_count = #{attendCount,jdbcType=INTEGER},
-      </if>
-      <if test="fansCount != null">
-        fans_count = #{fansCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectProductCount != null">
-        collect_product_count = #{collectProductCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectSubjectCount != null">
-        collect_subject_count = #{collectSubjectCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectTopicCount != null">
-        collect_topic_count = #{collectTopicCount,jdbcType=INTEGER},
-      </if>
-      <if test="collectCommentCount != null">
-        collect_comment_count = #{collectCommentCount,jdbcType=INTEGER},
-      </if>
-      <if test="inviteFriendCount != null">
-        invite_friend_count = #{inviteFriendCount,jdbcType=INTEGER},
-      </if>
-      <if test="recentOrderTime != null">
-        recent_order_time = #{recentOrderTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberStatisticsInfo">
-    update ums_member_statistics_info
-    set member_id = #{memberId,jdbcType=BIGINT},
-      consume_amount = #{consumeAmount,jdbcType=DECIMAL},
-      order_count = #{orderCount,jdbcType=INTEGER},
-      coupon_count = #{couponCount,jdbcType=INTEGER},
-      comment_count = #{commentCount,jdbcType=INTEGER},
-      return_order_count = #{returnOrderCount,jdbcType=INTEGER},
-      login_count = #{loginCount,jdbcType=INTEGER},
-      attend_count = #{attendCount,jdbcType=INTEGER},
-      fans_count = #{fansCount,jdbcType=INTEGER},
-      collect_product_count = #{collectProductCount,jdbcType=INTEGER},
-      collect_subject_count = #{collectSubjectCount,jdbcType=INTEGER},
-      collect_topic_count = #{collectTopicCount,jdbcType=INTEGER},
-      collect_comment_count = #{collectCommentCount,jdbcType=INTEGER},
-      invite_friend_count = #{inviteFriendCount,jdbcType=INTEGER},
-      recent_order_time = #{recentOrderTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberTagMapper.xml

@@ -1,196 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberTagMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberTag">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="finish_order_count" jdbcType="INTEGER" property="finishOrderCount" />
-    <result column="finish_order_amount" jdbcType="DECIMAL" property="finishOrderAmount" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, finish_order_count, finish_order_amount
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberTagExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_tag
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_tag
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_tag
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberTagExample">
-    delete from ums_member_tag
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberTag">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_tag (name, finish_order_count, finish_order_amount
-      )
-    values (#{name,jdbcType=VARCHAR}, #{finishOrderCount,jdbcType=INTEGER}, #{finishOrderAmount,jdbcType=DECIMAL}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberTag">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_tag
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="finishOrderCount != null">
-        finish_order_count,
-      </if>
-      <if test="finishOrderAmount != null">
-        finish_order_amount,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="finishOrderCount != null">
-        #{finishOrderCount,jdbcType=INTEGER},
-      </if>
-      <if test="finishOrderAmount != null">
-        #{finishOrderAmount,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberTagExample" resultType="java.lang.Long">
-    select count(*) from ums_member_tag
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_tag
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.finishOrderCount != null">
-        finish_order_count = #{record.finishOrderCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.finishOrderAmount != null">
-        finish_order_amount = #{record.finishOrderAmount,jdbcType=DECIMAL},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_tag
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      finish_order_count = #{record.finishOrderCount,jdbcType=INTEGER},
-      finish_order_amount = #{record.finishOrderAmount,jdbcType=DECIMAL}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberTag">
-    update ums_member_tag
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="finishOrderCount != null">
-        finish_order_count = #{finishOrderCount,jdbcType=INTEGER},
-      </if>
-      <if test="finishOrderAmount != null">
-        finish_order_amount = #{finishOrderAmount,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberTag">
-    update ums_member_tag
-    set name = #{name,jdbcType=VARCHAR},
-      finish_order_count = #{finishOrderCount,jdbcType=INTEGER},
-      finish_order_amount = #{finishOrderAmount,jdbcType=DECIMAL}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMemberTaskMapper.xml

@@ -1,211 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMemberTaskMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberTask">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="growth" jdbcType="INTEGER" property="growth" />
-    <result column="intergration" jdbcType="INTEGER" property="intergration" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, growth, intergration, type
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberTaskExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_member_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_member_task
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_member_task
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberTaskExample">
-    delete from ums_member_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberTask">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_task (name, growth, intergration, 
-      type)
-    values (#{name,jdbcType=VARCHAR}, #{growth,jdbcType=INTEGER}, #{intergration,jdbcType=INTEGER}, 
-      #{type,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberTask">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_member_task
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="growth != null">
-        growth,
-      </if>
-      <if test="intergration != null">
-        intergration,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="growth != null">
-        #{growth,jdbcType=INTEGER},
-      </if>
-      <if test="intergration != null">
-        #{intergration,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberTaskExample" resultType="java.lang.Long">
-    select count(*) from ums_member_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_member_task
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.growth != null">
-        growth = #{record.growth,jdbcType=INTEGER},
-      </if>
-      <if test="record.intergration != null">
-        intergration = #{record.intergration,jdbcType=INTEGER},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_member_task
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      growth = #{record.growth,jdbcType=INTEGER},
-      intergration = #{record.intergration,jdbcType=INTEGER},
-      type = #{record.type,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberTask">
-    update ums_member_task
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="growth != null">
-        growth = #{growth,jdbcType=INTEGER},
-      </if>
-      <if test="intergration != null">
-        intergration = #{intergration,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberTask">
-    update ums_member_task
-    set name = #{name,jdbcType=VARCHAR},
-      growth = #{growth,jdbcType=INTEGER},
-      intergration = #{intergration,jdbcType=INTEGER},
-      type = #{type,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsMenuMapper.xml

@@ -1,273 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsMenuMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMenu">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="level" jdbcType="INTEGER" property="level" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="hidden" jdbcType="INTEGER" property="hidden" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, parent_id, create_time, title, level, sort, name, icon, hidden
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMenuExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_menu
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_menu
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_menu
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMenuExample">
-    delete from ums_menu
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMenu">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_menu (parent_id, create_time, title, 
-      level, sort, name, 
-      icon, hidden)
-    values (#{parentId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{title,jdbcType=VARCHAR}, 
-      #{level,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
-      #{icon,jdbcType=VARCHAR}, #{hidden,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMenu">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_menu
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="parentId != null">
-        parent_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="level != null">
-        level,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="hidden != null">
-        hidden,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="parentId != null">
-        #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="level != null">
-        #{level,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="hidden != null">
-        #{hidden,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMenuExample" resultType="java.lang.Long">
-    select count(*) from ums_menu
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_menu
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.parentId != null">
-        parent_id = #{record.parentId,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
-      <if test="record.level != null">
-        level = #{record.level,jdbcType=INTEGER},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.hidden != null">
-        hidden = #{record.hidden,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_menu
-    set id = #{record.id,jdbcType=BIGINT},
-      parent_id = #{record.parentId,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      title = #{record.title,jdbcType=VARCHAR},
-      level = #{record.level,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER},
-      name = #{record.name,jdbcType=VARCHAR},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      hidden = #{record.hidden,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMenu">
-    update ums_menu
-    <set>
-      <if test="parentId != null">
-        parent_id = #{parentId,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="level != null">
-        level = #{level,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="hidden != null">
-        hidden = #{hidden,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMenu">
-    update ums_menu
-    set parent_id = #{parentId,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      title = #{title,jdbcType=VARCHAR},
-      level = #{level,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER},
-      name = #{name,jdbcType=VARCHAR},
-      icon = #{icon,jdbcType=VARCHAR},
-      hidden = #{hidden,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsPermissionMapper.xml

@@ -1,288 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsPermissionMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsPermission">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="pid" jdbcType="BIGINT" property="pid" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="value" jdbcType="VARCHAR" property="value" />
-    <result column="icon" jdbcType="VARCHAR" property="icon" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="uri" jdbcType="VARCHAR" property="uri" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, pid, name, value, icon, type, uri, status, create_time, sort
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsPermissionExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_permission
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_permission
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_permission
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsPermissionExample">
-    delete from ums_permission
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsPermission">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_permission (pid, name, value, 
-      icon, type, uri, status, 
-      create_time, sort)
-    values (#{pid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
-      #{icon,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{uri,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{sort,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsPermission">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_permission
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="pid != null">
-        pid,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="value != null">
-        value,
-      </if>
-      <if test="icon != null">
-        icon,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="uri != null">
-        uri,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="pid != null">
-        #{pid,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="value != null">
-        #{value,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-      <if test="uri != null">
-        #{uri,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsPermissionExample" resultType="java.lang.Long">
-    select count(*) from ums_permission
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_permission
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.pid != null">
-        pid = #{record.pid,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.value != null">
-        value = #{record.value,jdbcType=VARCHAR},
-      </if>
-      <if test="record.icon != null">
-        icon = #{record.icon,jdbcType=VARCHAR},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-      <if test="record.uri != null">
-        uri = #{record.uri,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_permission
-    set id = #{record.id,jdbcType=BIGINT},
-      pid = #{record.pid,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      value = #{record.value,jdbcType=VARCHAR},
-      icon = #{record.icon,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=INTEGER},
-      uri = #{record.uri,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      sort = #{record.sort,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsPermission">
-    update ums_permission
-    <set>
-      <if test="pid != null">
-        pid = #{pid,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="value != null">
-        value = #{value,jdbcType=VARCHAR},
-      </if>
-      <if test="icon != null">
-        icon = #{icon,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-      <if test="uri != null">
-        uri = #{uri,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsPermission">
-    update ums_permission
-    set pid = #{pid,jdbcType=BIGINT},
-      name = #{name,jdbcType=VARCHAR},
-      value = #{value,jdbcType=VARCHAR},
-      icon = #{icon,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
-      uri = #{uri,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsResourceCategoryMapper.xml

@@ -1,196 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsResourceCategoryMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsResourceCategory">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, create_time, name, sort
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsResourceCategoryExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_resource_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_resource_category
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_resource_category
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsResourceCategoryExample">
-    delete from ums_resource_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsResourceCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_resource_category (create_time, name, sort
-      )
-    values (#{createTime,jdbcType=TIMESTAMP}, #{name,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsResourceCategory">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_resource_category
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsResourceCategoryExample" resultType="java.lang.Long">
-    select count(*) from ums_resource_category
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_resource_category
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_resource_category
-    set id = #{record.id,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      name = #{record.name,jdbcType=VARCHAR},
-      sort = #{record.sort,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsResourceCategory">
-    update ums_resource_category
-    <set>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsResourceCategory">
-    update ums_resource_category
-    set create_time = #{createTime,jdbcType=TIMESTAMP},
-      name = #{name,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsResourceMapper.xml

@@ -1,226 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsResourceMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsResource">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="url" jdbcType="VARCHAR" property="url" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="category_id" jdbcType="BIGINT" property="categoryId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, create_time, name, url, description, category_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsResourceExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_resource
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_resource
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_resource
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsResourceExample">
-    delete from ums_resource
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsResource">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_resource (create_time, name, url, 
-      description, category_id)
-    values (#{createTime,jdbcType=TIMESTAMP}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{categoryId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsResource">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_resource
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="url != null">
-        url,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="categoryId != null">
-        category_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="url != null">
-        #{url,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="categoryId != null">
-        #{categoryId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsResourceExample" resultType="java.lang.Long">
-    select count(*) from ums_resource
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_resource
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.url != null">
-        url = #{record.url,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.categoryId != null">
-        category_id = #{record.categoryId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_resource
-    set id = #{record.id,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      name = #{record.name,jdbcType=VARCHAR},
-      url = #{record.url,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      category_id = #{record.categoryId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsResource">
-    update ums_resource
-    <set>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="url != null">
-        url = #{url,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="categoryId != null">
-        category_id = #{categoryId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsResource">
-    update ums_resource
-    set create_time = #{createTime,jdbcType=TIMESTAMP},
-      name = #{name,jdbcType=VARCHAR},
-      url = #{url,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      category_id = #{categoryId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsRoleMapper.xml

@@ -1,243 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsRoleMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsRole">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="admin_count" jdbcType="INTEGER" property="adminCount" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, description, admin_count, create_time, status, sort
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_role
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_role
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_role
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleExample">
-    delete from ums_role
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsRole">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role (name, description, admin_count, 
-      create_time, status, sort
-      )
-    values (#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{adminCount,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsRole">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        name,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="adminCount != null">
-        admin_count,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="adminCount != null">
-        #{adminCount,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleExample" resultType="java.lang.Long">
-    select count(*) from ums_role
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_role
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.adminCount != null">
-        admin_count = #{record.adminCount,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_role
-    set id = #{record.id,jdbcType=BIGINT},
-      name = #{record.name,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      admin_count = #{record.adminCount,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      status = #{record.status,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsRole">
-    update ums_role
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="adminCount != null">
-        admin_count = #{adminCount,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsRole">
-    update ums_role
-    set name = #{name,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      admin_count = #{adminCount,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsRoleMenuRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsRoleMenuRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsRoleMenuRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="role_id" jdbcType="BIGINT" property="roleId" />
-    <result column="menu_id" jdbcType="BIGINT" property="menuId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, role_id, menu_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleMenuRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_role_menu_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_role_menu_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_role_menu_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleMenuRelationExample">
-    delete from ums_role_menu_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsRoleMenuRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role_menu_relation (role_id, menu_id)
-    values (#{roleId,jdbcType=BIGINT}, #{menuId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsRoleMenuRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role_menu_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
-        role_id,
-      </if>
-      <if test="menuId != null">
-        menu_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
-        #{roleId,jdbcType=BIGINT},
-      </if>
-      <if test="menuId != null">
-        #{menuId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleMenuRelationExample" resultType="java.lang.Long">
-    select count(*) from ums_role_menu_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_role_menu_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.roleId != null">
-        role_id = #{record.roleId,jdbcType=BIGINT},
-      </if>
-      <if test="record.menuId != null">
-        menu_id = #{record.menuId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_role_menu_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      role_id = #{record.roleId,jdbcType=BIGINT},
-      menu_id = #{record.menuId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsRoleMenuRelation">
-    update ums_role_menu_relation
-    <set>
-      <if test="roleId != null">
-        role_id = #{roleId,jdbcType=BIGINT},
-      </if>
-      <if test="menuId != null">
-        menu_id = #{menuId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsRoleMenuRelation">
-    update ums_role_menu_relation
-    set role_id = #{roleId,jdbcType=BIGINT},
-      menu_id = #{menuId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsRolePermissionRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsRolePermissionRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsRolePermissionRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="role_id" jdbcType="BIGINT" property="roleId" />
-    <result column="permission_id" jdbcType="BIGINT" property="permissionId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, role_id, permission_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsRolePermissionRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_role_permission_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_role_permission_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_role_permission_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsRolePermissionRelationExample">
-    delete from ums_role_permission_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsRolePermissionRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role_permission_relation (role_id, permission_id)
-    values (#{roleId,jdbcType=BIGINT}, #{permissionId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsRolePermissionRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role_permission_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
-        role_id,
-      </if>
-      <if test="permissionId != null">
-        permission_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
-        #{roleId,jdbcType=BIGINT},
-      </if>
-      <if test="permissionId != null">
-        #{permissionId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsRolePermissionRelationExample" resultType="java.lang.Long">
-    select count(*) from ums_role_permission_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_role_permission_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.roleId != null">
-        role_id = #{record.roleId,jdbcType=BIGINT},
-      </if>
-      <if test="record.permissionId != null">
-        permission_id = #{record.permissionId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_role_permission_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      role_id = #{record.roleId,jdbcType=BIGINT},
-      permission_id = #{record.permissionId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsRolePermissionRelation">
-    update ums_role_permission_relation
-    <set>
-      <if test="roleId != null">
-        role_id = #{roleId,jdbcType=BIGINT},
-      </if>
-      <if test="permissionId != null">
-        permission_id = #{permissionId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsRolePermissionRelation">
-    update ums_role_permission_relation
-    set role_id = #{roleId,jdbcType=BIGINT},
-      permission_id = #{permissionId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-mbg/src/main/resources/mapper/UmsRoleResourceRelationMapper.xml

@@ -1,179 +0,0 @@
-<?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.hwrj.cloud.admin.mapper.UmsRoleResourceRelationMapper">
-  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsRoleResourceRelation">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="role_id" jdbcType="BIGINT" property="roleId" />
-    <result column="resource_id" jdbcType="BIGINT" property="resourceId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, role_id, resource_id
-  </sql>
-  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleResourceRelationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from ums_role_resource_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from ums_role_resource_relation
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from ums_role_resource_relation
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleResourceRelationExample">
-    delete from ums_role_resource_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsRoleResourceRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role_resource_relation (role_id, resource_id)
-    values (#{roleId,jdbcType=BIGINT}, #{resourceId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsRoleResourceRelation">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ums_role_resource_relation
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
-        role_id,
-      </if>
-      <if test="resourceId != null">
-        resource_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
-        #{roleId,jdbcType=BIGINT},
-      </if>
-      <if test="resourceId != null">
-        #{resourceId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsRoleResourceRelationExample" resultType="java.lang.Long">
-    select count(*) from ums_role_resource_relation
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update ums_role_resource_relation
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.roleId != null">
-        role_id = #{record.roleId,jdbcType=BIGINT},
-      </if>
-      <if test="record.resourceId != null">
-        resource_id = #{record.resourceId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update ums_role_resource_relation
-    set id = #{record.id,jdbcType=BIGINT},
-      role_id = #{record.roleId,jdbcType=BIGINT},
-      resource_id = #{record.resourceId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsRoleResourceRelation">
-    update ums_role_resource_relation
-    <set>
-      <if test="roleId != null">
-        role_id = #{roleId,jdbcType=BIGINT},
-      </if>
-      <if test="resourceId != null">
-        resource_id = #{resourceId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsRoleResourceRelation">
-    update ums_role_resource_relation
-    set role_id = #{roleId,jdbcType=BIGINT},
-      resource_id = #{resourceId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsCompanyShareController.java

@@ -26,7 +26,7 @@ public class UmsCompanyShareController {
 
     @ApiOperation(value = "分享码生成")
     @GetMapping("/add")
-    public CommonResult shareCodeAdd(@RequestParam(required = true,value = "compId")Long compId, @RequestParam(required = false,value = "compName")String compName){
+    public CommonResult shareCodeAdd(@RequestParam(required = true,value = "compId")Long compId, @RequestParam(required = true,value = "compName")String compName){
         String s = umsCompanyShareService.addShare(compId, compName);
         if (StringUtils.isEmpty(s)){
             return CommonResult.failed("邀请码生成失败");

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UploadCompanyInfoAndProductController.java

@@ -573,6 +573,11 @@ public class UploadCompanyInfoAndProductController {
             }
         }
         List<PmsBrand> bandlist = new ArrayList<>();
+        //去除品牌里面的空格以及空字符
+        for(PmsProductParam  pmsProductParam:listAll){
+            String brandName = pmsProductParam.getBrandName();
+            pmsProductParam.setBrandName(MyStringUtils.replaceBlank(brandName));
+        }
         log.info("开始插入品牌数据");
         List<String> BandNames = listAll.stream().map(PmsProductParam::getBrandName).distinct().collect(Collectors.toList());
         for (String bandName : BandNames) {

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyShareServiceImpl.java

@@ -2,9 +2,11 @@ package com.hwrj.cloud.admin.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.hwrj.cloud.admin.mapper.UmsCompanyShareMapper;
+import com.hwrj.cloud.admin.mapper.UmsMemberMapper;
 import com.hwrj.cloud.admin.model.UmsAdmin;
 import com.hwrj.cloud.admin.model.UmsCompanyShare;
 import com.hwrj.cloud.admin.model.UmsCompanyShareExample;
+import com.hwrj.cloud.admin.model.UmsMember;
 import com.hwrj.cloud.admin.service.UmsCompanyShareService;
 import com.hwrj.cloud.admin.util.CurrUserUtil;
 import com.hwrj.cloud.common.util.ShareCodeUtil;
@@ -48,6 +50,10 @@ public class UmsCompanyShareServiceImpl implements UmsCompanyShareService {
         return code;
     }
 
+
+    @Autowired
+    private UmsMemberMapper umsMemberMapper;
+
     @Override
     public List<UmsCompanyShare> shareList(Long compId,int status, int pageNo, int pageSize) {
         if (compId == null){
@@ -62,6 +68,10 @@ public class UmsCompanyShareServiceImpl implements UmsCompanyShareService {
         criteria.andStatusNotEqualTo(2);
         PageHelper.startPage(pageNo,pageSize);
         List<UmsCompanyShare> shares = umsCompanyShareMapper.selectByExample(umsCompanyShareExample);
+        for (UmsCompanyShare share : shares) {
+            UmsMember umsMember = umsMemberMapper.selectByPrimaryKey(share.getMemberId());
+            share.setMember(umsMember.getNickname());
+        }
         return shares;
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/util/MyStringUtils.java

@@ -0,0 +1,33 @@
+package com.hwrj.cloud.admin.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class MyStringUtils {
+    public static String replaceBlank(String str) {
+        String dest = "";
+        if (str!=null) {
+            Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+            Matcher m = p.matcher(str);
+            dest = m.replaceAll("");
+        }
+        return dest;
+    }
+    public static void main(String[] args) {
+        System.out.println(MyStringUtils.replaceBlank("just do it!"));
+    }
+	/*-----------------------------------
+
+	笨方法：String s = "你要去除的字符串";
+
+	        1.去除空格：s = s.replace('\\s','');
+
+	        2.去除回车：s = s.replace('\n','');
+
+	这样也可以把空格和回车去掉，其他也可以照这样做。
+
+	注：\n 回车(\u000a)
+	\t 水平制表符(\u0009)
+	\s 空格(\u0008)
+	\r 换行(\u000d)*/
+}

forest-common/src/main/java/com/hwrj/cloud/common/api/CommonResult.java

@@ -71,6 +71,15 @@ public class CommonResult<T> {
         return new CommonResult<T>(errorCode.getCode(), message, null);
     }
 
+    /**
+     * 失败返回结果
+     * @param errorCode 错误码
+     * @param message 错误信息
+     */
+    public static <T> CommonResult<T> failed(long errorCode,String message) {
+        return new CommonResult<T>(errorCode, message, null);
+    }
+
     /**
      * 失败返回结果
      * @param message 提示信息

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/config/exception/GlobalExceptionHandler.java

@@ -0,0 +1,25 @@
+package com.hwrj.cloud.portal.config.exception;
+
+import com.hwrj.cloud.common.api.CommonResult;
+import com.hwrj.cloud.common.api.IErrorCode;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 全局异常捕获
+ * @author 大仙
+ */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    /**
+     * 处理自定义异常
+     * @param ex
+     * @return
+     */
+    @ExceptionHandler(RuntimeException.class)
+    @ResponseBody
+    public CommonResult handleOrderException(RuntimeException ex) {
+        return CommonResult.failed(500 ,ex.getMessage());
+    }
+}

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/UmsCompanyInfoServiceImpl.java

@@ -43,6 +43,9 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyInfoService {
         }
         UmsCompanyInfoDto umsCompanyInfoDto = new UmsCompanyInfoDto();
         UmsCompanyInfo info = umsCompanyInfoMapper.selectByPrimaryKey(id);
+        if(StringUtils.isEmpty(info)){
+            throw  new RuntimeException("不是供应商,无法完成发布商品!");
+        }
         Long compId = info.getId();
         BeanUtil.copyProperties(info,umsCompanyInfoDto);
         List<UmsCompanyFile> listFile = getCompanyFileByCompanyId(compId);

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/UmsMemberServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.hwrj.cloud.common.exception.Asserts;
 import com.hwrj.cloud.portal.dao.UmsMemberDao;
 import com.hwrj.cloud.portal.domain.UmsMemberPlaformDo;
+import com.hwrj.cloud.portal.mapper.UmsCompanyShareMapper;
 import com.hwrj.cloud.portal.mapper.UmsMemberLevelMapper;
 import com.hwrj.cloud.portal.mapper.UmsMemberMapper;
 import com.hwrj.cloud.portal.mapper.UmsMemberPlatformMapper;
@@ -186,6 +187,9 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         MemberDetails memberDetails = (MemberDetails) auth.getPrincipal();
         return memberDetails.getUmsMember();
     }
+
+    @Autowired
+    private UmsCompanyShareMapper umsCompanyShareMapper;
     @Override
     public Map<String,Object> getCurrentWxUser() {
         SecurityContext ctx = SecurityContextHolder.getContext();
@@ -207,12 +211,21 @@ public class UmsMemberServiceImpl implements UmsMemberService {
             map.put("wxUsers",platforms.get(0));
             Map<String, Object> ownData = umsMemberDao.getOwnData(umsMember.getId());
             map.put("pre",ownData);
+            getCompany(umsMember, map);
         }
-
-
         return map;
     }
 
+    private void getCompany(UmsMember umsMember, Map<String, Object> map) {
+        UmsCompanyShareExample example=new UmsCompanyShareExample();
+        UmsCompanyShareExample.Criteria criteria = example.createCriteria();
+        criteria.andMemberIdEqualTo(umsMember.getId());
+        List<UmsCompanyShare> umsCompanyShares = umsCompanyShareMapper.selectByExample(example);
+        if(umsCompanyShares.size()>0){
+            map.put("company",umsCompanyShares.get(0));
+        }
+    }
+
     @Override
     public void updateIntegration(Long id, Integer integration) {
         UmsMember record = new UmsMember();