富文本

src/main/java/com/izouma/awesomeadmin/dao/ProductPriceMapper.xml

@@ -1,24 +1,24 @@
 <?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.izouma.awesomeadmin.dao.ProductPriceMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductPrice" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="product_id" property="productId" jdbcType="VARCHAR" />
-                                <result column="name" property="name" jdbcType="VARCHAR" />
-                                <result column="price" property="price" jdbcType="DECIMAL" />
-                                <result column="type_flag" property="typeFlag" jdbcType="INTEGER" />
-                                <result column="min_counts" property="minCounts" jdbcType="INTEGER" />
-                                <result column="max_counts" property="maxCounts" jdbcType="INTEGER" />
-                                <result column="inventory" property="inventory" jdbcType="INTEGER" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
+<mapper namespace="com.izouma.awesomeadmin.dao.ProductPriceMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.ProductPrice">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="product_id" property="productId" jdbcType="VARCHAR"/>
+        <result column="name" property="name" jdbcType="VARCHAR"/>
+        <result column="price" property="price" jdbcType="DECIMAL"/>
+        <result column="type_flag" property="typeFlag" jdbcType="INTEGER"/>
+        <result column="min_counts" property="minCounts" jdbcType="INTEGER"/>
+        <result column="max_counts" property="maxCounts" jdbcType="INTEGER"/>
+        <result column="inventory" property="inventory" jdbcType="INTEGER"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
             id,
 
             del_flag,
@@ -47,215 +47,213 @@
 
             remark,
 
-            </trim>
+        </trim>
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from product_price
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from product_price
         where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductPrice" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.ProductPrice" useGeneratedKeys="true"
+            keyProperty="id">
         insert into product_price
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
                 id,
             </if>
-                <if test="delFlag!= null" >
+            <if test="delFlag!= null">
                 del_flag,
             </if>
-                <if test="updateTime!= null" >
+            <if test="updateTime!= null">
                 update_time,
             </if>
-                <if test="updateUser!= null" >
+            <if test="updateUser!= null">
                 update_user,
             </if>
-                <if test="createTime!= null" >
+            <if test="createTime!= null">
                 create_time,
             </if>
-                <if test="createUser!= null" >
+            <if test="createUser!= null">
                 create_user,
             </if>
-                <if test="productId!= null" >
+            <if test="productId!= null">
                 product_id,
             </if>
-                <if test="name!= null" >
+            <if test="name!= null">
                 name,
             </if>
-                <if test="price!= null" >
+            <if test="price!= null">
                 price,
             </if>
-                <if test="typeFlag!= null" >
+            <if test="typeFlag!= null">
                 type_flag,
             </if>
-                <if test="minCounts!= null" >
+            <if test="minCounts!= null">
                 min_counts,
             </if>
-                <if test="maxCounts!= null" >
-                max_counts,
-            </if>
-                <if test="inventory!= null" >
+            max_counts,
+            <if test="inventory!= null">
                 inventory,
             </if>
-                <if test="remark!= null" >
+            <if test="remark!= null">
                 remark,
             </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
                 #{id,jdbcType=INTEGER},
             </if>
-                    <if test="delFlag != null" >
+            <if test="delFlag != null">
                 #{delFlag,jdbcType=CHAR},
             </if>
-                    <if test="updateTime != null" >
+            <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="updateUser != null" >
+            <if test="updateUser != null">
                 #{updateUser,jdbcType=VARCHAR},
             </if>
-                    <if test="createTime != null" >
+            <if test="createTime != null">
                 #{createTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="createUser != null" >
+            <if test="createUser != null">
                 #{createUser,jdbcType=VARCHAR},
             </if>
-                    <if test="productId != null" >
+            <if test="productId != null">
                 #{productId,jdbcType=VARCHAR},
             </if>
-                    <if test="name != null" >
+            <if test="name != null">
                 #{name,jdbcType=VARCHAR},
             </if>
-                    <if test="price != null" >
+            <if test="price != null">
                 #{price,jdbcType=DECIMAL},
             </if>
-                    <if test="typeFlag != null" >
+            <if test="typeFlag != null">
                 #{typeFlag,jdbcType=INTEGER},
             </if>
-                    <if test="minCounts != null" >
+            <if test="minCounts != null">
                 #{minCounts,jdbcType=INTEGER},
             </if>
-                    <if test="maxCounts != null" >
-                #{maxCounts,jdbcType=INTEGER},
-            </if>
-                    <if test="inventory != null" >
+            #{maxCounts,jdbcType=INTEGER},
+            <if test="inventory != null">
                 #{inventory,jdbcType=INTEGER},
             </if>
-                    <if test="remark != null" >
+            <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
-                </trim>
+        </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductPrice" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ProductPrice">
         update product_price
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
             </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
             </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
             </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
             </if>
-                     <if test="productId != null" >
-               product_id= #{productId,jdbcType=VARCHAR},
+            <if test="productId != null">
+                product_id= #{productId,jdbcType=VARCHAR},
             </if>
-                     <if test="name != null" >
-               name= #{name,jdbcType=VARCHAR},
+            <if test="name != null">
+                name= #{name,jdbcType=VARCHAR},
             </if>
-                     <if test="price != null" >
-               price= #{price,jdbcType=DECIMAL},
+            <if test="price != null">
+                price= #{price,jdbcType=DECIMAL},
             </if>
-                     <if test="typeFlag != null" >
-               type_flag= #{typeFlag,jdbcType=INTEGER},
+            <if test="typeFlag != null">
+                type_flag= #{typeFlag,jdbcType=INTEGER},
             </if>
-                     <if test="minCounts != null" >
-               min_counts= #{minCounts,jdbcType=INTEGER},
+            <if test="minCounts != null">
+                min_counts= #{minCounts,jdbcType=INTEGER},
             </if>
-                     <if test="maxCounts != null" >
-               max_counts= #{maxCounts,jdbcType=INTEGER},
+            max_counts= #{maxCounts,jdbcType=INTEGER},
+            <if test="inventory != null">
+                inventory= #{inventory,jdbcType=INTEGER},
             </if>
-                     <if test="inventory != null" >
-               inventory= #{inventory,jdbcType=INTEGER},
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
             </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
-            </if>
-                 </set>
+        </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
-    <select id="queryProductPriceByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select <include refid="Base_Column_List"/> from product_price
+    <select id="queryProductPriceByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ProductPrice">
+        select
+        <include refid="Base_Column_List"/>
+        from product_price
         <where>
             and del_flag = 'N'
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
             </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
             </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
             </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
             </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
             </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
+            <if test="record.productId != null and !&quot;&quot;.equals(record.productId)">
+                and product_id = #{record.productId}
             </if>
-                     <if test="record.productId != null and !&quot;&quot;.equals(record.productId)">
-                and  product_id = #{record.productId}
+            <if test="record.name != null and !&quot;&quot;.equals(record.name)">
+                and name = #{record.name}
             </if>
-                     <if test="record.name != null and !&quot;&quot;.equals(record.name)">
-                and  name = #{record.name}
+            <if test="record.price != null and !&quot;&quot;.equals(record.price)">
+                and price = #{record.price}
             </if>
-                     <if test="record.price != null and !&quot;&quot;.equals(record.price)">
-                and  price = #{record.price}
+            <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
+                and type_flag = #{record.typeFlag}
             </if>
-                     <if test="record.typeFlag != null and !&quot;&quot;.equals(record.typeFlag)">
-                and  type_flag = #{record.typeFlag}
+            <if test="record.minCounts != null and !&quot;&quot;.equals(record.minCounts)">
+                and min_counts = #{record.minCounts}
             </if>
-                     <if test="record.minCounts != null and !&quot;&quot;.equals(record.minCounts)">
-                and  min_counts = #{record.minCounts}
+            <if test="record.maxCounts != null and !&quot;&quot;.equals(record.maxCounts)">
+                and max_counts = #{record.maxCounts}
             </if>
-                     <if test="record.maxCounts != null and !&quot;&quot;.equals(record.maxCounts)">
-                and  max_counts = #{record.maxCounts}
+            <if test="record.inventory != null and !&quot;&quot;.equals(record.inventory)">
+                and inventory = #{record.inventory}
             </if>
-                     <if test="record.inventory != null and !&quot;&quot;.equals(record.inventory)">
-                and  inventory = #{record.inventory}
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
             </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR product_id LIKE concat('%',#{record.searchKey},'%')
+                    OR name LIKE concat('%',#{record.searchKey},'%')
+                    OR price LIKE concat('%',#{record.searchKey},'%')
+                    OR type_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR min_counts LIKE concat('%',#{record.searchKey},'%')
+                    OR max_counts LIKE concat('%',#{record.searchKey},'%')
+                    OR inventory LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                </trim>
             </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  product_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  name LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  price LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  type_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  min_counts LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  max_counts LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  inventory LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
                 <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
@@ -309,98 +307,101 @@
         </if>
         product_id, type_flag , id desc
     </select>
-    <select id="queryAllProductPrice" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select <include refid="Base_Column_List"/> from product_price
+    <select id="queryAllProductPrice" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ProductPrice">
+        select
+        <include refid="Base_Column_List"/>
+        from product_price
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
             </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
             </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
             </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
             </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
             </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
             </if>
-                    <if test="productId != null and !&quot;&quot;.equals(productId)">
-                and  product_id = #{productId}
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
+                and product_id = #{productId}
             </if>
-                    <if test="name != null and !&quot;&quot;.equals(name)">
-                and  name = #{name}
+            <if test="name != null and !&quot;&quot;.equals(name)">
+                and name = #{name}
             </if>
-                    <if test="price != null and !&quot;&quot;.equals(price)">
-                and  price = #{price}
+            <if test="price != null and !&quot;&quot;.equals(price)">
+                and price = #{price}
             </if>
-                    <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
-                and  type_flag = #{typeFlag}
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+                and type_flag = #{typeFlag}
             </if>
-                    <if test="minCounts != null and !&quot;&quot;.equals(minCounts)">
-                and  min_counts = #{minCounts}
+            <if test="minCounts != null and !&quot;&quot;.equals(minCounts)">
+                and min_counts = #{minCounts}
             </if>
-                    <if test="maxCounts != null and !&quot;&quot;.equals(maxCounts)">
-                and  max_counts = #{maxCounts}
+            <if test="maxCounts != null and !&quot;&quot;.equals(maxCounts)">
+                and max_counts = #{maxCounts}
             </if>
-                    <if test="inventory != null and !&quot;&quot;.equals(inventory)">
-                and  inventory = #{inventory}
+            <if test="inventory != null and !&quot;&quot;.equals(inventory)">
+                and inventory = #{inventory}
             </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
             </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  product_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  name LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  price LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  type_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  min_counts LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  max_counts LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  inventory LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR product_id LIKE concat('%',#{searchKey},'%')
+                    OR name LIKE concat('%',#{searchKey},'%')
+                    OR price LIKE concat('%',#{searchKey},'%')
+                    OR type_flag LIKE concat('%',#{searchKey},'%')
+                    OR min_counts LIKE concat('%',#{searchKey},'%')
+                    OR max_counts LIKE concat('%',#{searchKey},'%')
+                    OR inventory LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                </trim>
             </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
 
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
 
-                </foreach>
-            </otherwise>
-        </choose>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
 
 
-    </foreach>
+                </foreach>
 
 
-</if>
+            </if>
         </where>
         order by
 
@@ -419,53 +420,56 @@
 
         product_id, type_flag , id desc
     </select>
-    <select id="queryProductPrice" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select <include refid="Base_Column_List"/> from product_price
+    <select id="queryProductPrice" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.ProductPrice">
+        select
+        <include refid="Base_Column_List"/>
+        from product_price
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
+            <if test="id != null and !&quot;&quot;.equals(id)">
                 and id = #{id}
             </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
                 and update_time = #{updateTime}
             </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
                 and update_user = #{updateUser}
             </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
                 and create_time = #{createTime}
             </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and create_user = #{createUser}
             </if>
-                     <if test="productId != null and !&quot;&quot;.equals(productId)">
+            <if test="productId != null and !&quot;&quot;.equals(productId)">
                 and product_id = #{productId}
             </if>
-                     <if test="name != null and !&quot;&quot;.equals(name)">
+            <if test="name != null and !&quot;&quot;.equals(name)">
                 and name = #{name}
             </if>
-                     <if test="price != null and !&quot;&quot;.equals(price)">
+            <if test="price != null and !&quot;&quot;.equals(price)">
                 and price = #{price}
             </if>
-                     <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
+            <if test="typeFlag != null and !&quot;&quot;.equals(typeFlag)">
                 and type_flag = #{typeFlag}
             </if>
-                     <if test="minCounts != null and !&quot;&quot;.equals(minCounts)">
+            <if test="minCounts != null and !&quot;&quot;.equals(minCounts)">
                 and min_counts = #{minCounts}
             </if>
-                     <if test="maxCounts != null and !&quot;&quot;.equals(maxCounts)">
+            <if test="maxCounts != null and !&quot;&quot;.equals(maxCounts)">
                 and max_counts = #{maxCounts}
             </if>
-                     <if test="inventory != null and !&quot;&quot;.equals(inventory)">
+            <if test="inventory != null and !&quot;&quot;.equals(inventory)">
                 and inventory = #{inventory}
             </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>
-         
+
         </where>
         LIMIT 1
     </select>
@@ -476,10 +480,12 @@
         </where>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ProductPrice">
-        select <include refid="Base_Column_List"/> from product_price
+        select
+        <include refid="Base_Column_List"/>
+        from product_price
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        </where>
         order by id desc
     </select>
 </mapper>

src/main/vue/src/components/RichText.vue

@@ -33,7 +33,7 @@
 
     require('./zh_CN');
     export default {
-        props: ['value', 'disabled'],
+        props: ['value', 'disabled','height'],
         created() {
             this.content = this.value || ''
         },
@@ -54,6 +54,10 @@
                 console.log(1111)
             },
             initEditor() {
+                var height=300
+                if(this.height){
+height=this.height
+                }
                 tinymce.init({
                     target: this.$refs.editor,
                     skin_url: '/static/skins/lightgray',
@@ -61,7 +65,7 @@
                     menubar: false,
                     branding: false,
                     statusbar: false,
-                    height: 300,
+                    height: height,
                     toolbar: 'undo redo | styleselect bold italic strikethrough forecolor backcolor  | image media link blockquote visualblocks insert | formatselect | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | preview fullscreen code help',
                     plugins: [
                         'advlist autolink lists link image charmap print preview anchor textcolor',

src/main/vue/src/pages/AboutUs.vue

@@ -5,7 +5,7 @@
                 <el-input v-model="formData.title" :disabled="'title'==subColumn"></el-input>
             </el-form-item>
             <el-form-item prop="description" label="介绍">
-                <el-input type="textarea" v-model="formData.description" :disabled="'description'==subColumn" :autosize="{ minRows: 2, maxRows: 20}"></el-input>
+                <rich-text :height='500' v-model="formData.description"></rich-text>
             </el-form-item>
             <el-form-item prop="image" label="图片">
                 <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
@@ -18,6 +18,7 @@
 </template>
 <script>
 import formValidator from '../formValidator'
+import RichText from '../components/RichText'
 
 export default {
     created() {
@@ -101,6 +102,9 @@ export default {
                 }
             })
         },
+    },
+    components: {
+        RichText
     }
 }
 </script>

src/main/vue/src/pages/ShopAgreement.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 800px;">
             <el-form-item prop="agreement" label="协议">
-                <rich-text v-model="formData.agreement" :disabled="'agreement'==subColumn"></rich-text>
+                <rich-text :height='500' v-model="formData.agreement" :disabled="'agreement'==subColumn"></rich-text>
             </el-form-item>
             <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>