更新第三方插件mybatis-generator-plugin到1.3.2，所以代码都是自动生成。

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallPermissionMapper.xml

@@ -108,7 +108,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -117,11 +116,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, role_id, permission, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_permission
@@ -143,11 +142,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -170,17 +164,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, role_id, permission, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_permission
@@ -359,7 +352,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -376,17 +368,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, role_id, permission, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_permission
@@ -402,7 +393,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_permission set deleted = 1
     <if test="_parameter != null">
@@ -413,7 +403,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_permission set deleted = 1
     where id = #{id,jdbcType=INTEGER}

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRegionMapper.xml

@@ -107,7 +107,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -116,11 +115,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, pid, `name`, `type`, code
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_region
@@ -145,17 +144,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, pid, `name`, `type`, code
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_region
@@ -320,7 +318,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -337,17 +334,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, pid, `name`, `type`, code
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_region

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRoleMapper.xml

@@ -109,7 +109,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -118,11 +117,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, `name`, `desc`, enabled, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_role
@@ -144,11 +143,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -171,17 +165,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, `name`, `desc`, enabled, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_role
@@ -376,7 +369,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -393,17 +385,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, `name`, `desc`, enabled, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_role
@@ -419,7 +410,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_role set deleted = 1
     <if test="_parameter != null">
@@ -430,7 +420,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_role set deleted = 1
     where id = #{id,jdbcType=INTEGER}

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSearchHistoryMapper.xml

@@ -109,7 +109,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -118,11 +117,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, user_id, keyword, `from`, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_search_history
@@ -144,11 +143,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -171,17 +165,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, user_id, keyword, `from`, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_search_history
@@ -376,7 +369,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -393,17 +385,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, user_id, keyword, `from`, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_search_history
@@ -419,7 +410,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_search_history set deleted = 1
     <if test="_parameter != null">
@@ -430,7 +420,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_search_history set deleted = 1
     where id = #{id,jdbcType=INTEGER}

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallStorageMapper.xml

@@ -111,7 +111,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -120,11 +119,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, `key`, `name`, `type`, `size`, url, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_storage
@@ -146,11 +145,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -173,17 +167,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, `key`, `name`, `type`, `size`, url, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_storage
@@ -406,7 +399,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -423,17 +415,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, `key`, `name`, `type`, `size`, url, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_storage
@@ -449,7 +440,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_storage set deleted = 1
     <if test="_parameter != null">
@@ -460,7 +450,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_storage set deleted = 1
     where id = #{id,jdbcType=INTEGER}

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSystemMapper.xml

@@ -108,7 +108,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -117,11 +116,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, key_name, key_value, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_system
@@ -143,11 +142,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -170,17 +164,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, key_name, key_value, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_system
@@ -359,7 +352,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -376,17 +368,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, key_name, key_value, add_time, update_time, deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_system
@@ -402,7 +393,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_system set deleted = 1
     <if test="_parameter != null">
@@ -413,7 +403,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_system set deleted = 1
     where id = #{id,jdbcType=INTEGER}

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml

@@ -186,7 +186,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -195,12 +194,13 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, update_time, 
-          deleted, content
+        <include refid="Base_Column_List" />
+        ,
+        <include refid="Blob_Column_List" />
       </otherwise>
     </choose>
     from litemall_topic
@@ -224,11 +224,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -253,18 +248,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, update_time, 
-          deleted, content
+        <include refid="Base_Column_List" />
+        ,
+        <include refid="Blob_Column_List" />
       </otherwise>
     </choose>
     from litemall_topic
@@ -572,7 +567,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -589,7 +583,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -608,18 +601,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, update_time, 
-          deleted, content
+        <include refid="Base_Column_List" />
+        ,
+        <include refid="Blob_Column_List" />
       </otherwise>
     </choose>
     from litemall_topic
@@ -635,7 +628,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_topic set deleted = 1
     <if test="_parameter != null">
@@ -646,7 +638,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_topic set deleted = 1
     where id = #{id,jdbcType=INTEGER}

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserFormidMapper.xml

@@ -111,7 +111,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -120,12 +119,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, formId, isprepay, useAmount, expire_time, openId, add_time, update_time, deleted
-          
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_user_formid
@@ -147,11 +145,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -174,18 +167,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, formId, isprepay, useAmount, expire_time, openId, add_time, update_time, deleted
-          
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_user_formid
@@ -408,7 +399,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -425,18 +415,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, formId, isprepay, useAmount, expire_time, openId, add_time, update_time, deleted
-          
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_user_formid
@@ -452,7 +440,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_user_formid set deleted = 1
     <if test="_parameter != null">
@@ -463,7 +450,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_user_formid set deleted = 1
     where id = #{id,jdbcType=INTEGER}

litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml

@@ -121,7 +121,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <if test="example.distinct">
@@ -130,13 +129,11 @@
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, 
-          nickname, mobile, avatar, weixin_openid, session_key, `status`, add_time, update_time, 
-          deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_user
@@ -158,11 +155,6 @@
     where id = #{id,jdbcType=INTEGER}
   </select>
   <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
-    -->
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -185,19 +177,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, 
-          nickname, mobile, avatar, weixin_openid, session_key, `status`, add_time, update_time, 
-          deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_user
@@ -538,7 +527,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <include refid="Base_Column_List" />
@@ -555,19 +543,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
     <choose>
       <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
-          ${column.escapedColumnName}
+          ${column.aliasedEscapedColumnName}
         </foreach>
       </when>
       <otherwise>
-        id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, 
-          nickname, mobile, avatar, weixin_openid, session_key, `status`, add_time, update_time, 
-          deleted
+        <include refid="Base_Column_List" />
       </otherwise>
     </choose>
     from litemall_user
@@ -583,7 +568,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_user set deleted = 1
     <if test="_parameter != null">
@@ -594,7 +578,6 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     update litemall_user set deleted = 1
     where id = #{id,jdbcType=INTEGER}