update[litemall-db]: 更新mybatis generator插件到1.2.3。

1. 设置逻辑删除插件
2. 设置乐观锁插件

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProduct.java

@@ -5,6 +5,44 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 
 public class LitemallProduct {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_product
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean NOT_DELETED = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_product
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_ON = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_product
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean IS_DELETED = true;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_product
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_OFF = true;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -342,6 +380,17 @@ public class LitemallProduct {
         return result;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_product
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? IS_DELETED : NOT_DELETED);
+    }
+
     /**
      * This enum was generated by MyBatis Generator.
      * This enum corresponds to the database table litemall_product
@@ -350,14 +399,14 @@ public class LitemallProduct {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     public enum Column {
-        id("id"),
-        goodsId("goods_id"),
-        goodsSpecificationIds("goods_specification_ids"),
-        goodsNumber("goods_number"),
-        retailPrice("retail_price"),
-        url("url"),
-        addTime("add_time"),
-        deleted("deleted");
+        id("id", "id", "INTEGER"),
+        goodsId("goods_id", "goodsId", "INTEGER"),
+        goodsSpecificationIds("goods_specification_ids", "goodsSpecificationIds", "CHAR"),
+        goodsNumber("goods_number", "goodsNumber", "INTEGER"),
+        retailPrice("retail_price", "retailPrice", "DECIMAL"),
+        url("url", "url", "VARCHAR"),
+        addTime("add_time", "addTime", "TIMESTAMP"),
+        deleted("deleted", "deleted", "BIT");
 
         /**
          * This field was generated by MyBatis Generator.
@@ -368,6 +417,24 @@ public class LitemallProduct {
          */
         private final String column;
 
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_product
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_product
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_product
@@ -397,8 +464,32 @@ public class LitemallProduct {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        Column(String column) {
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_product
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_product
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType) {
             this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
         }
 
         /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProductExample.java

@@ -117,13 +117,11 @@ public class LitemallProductExample {
      * This method corresponds to the database table litemall_product
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
+    public LitemallProductExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
     }
 
     /**
@@ -131,10 +129,18 @@ public class LitemallProductExample {
      * This method corresponds to the database table litemall_product
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria(this);
-        return criteria;
+    public LitemallProductExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
     }
 
     /**
@@ -143,10 +149,12 @@ public class LitemallProductExample {
      *
      * @mbg.generated
      */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
     }
 
     /**
@@ -154,11 +162,10 @@ public class LitemallProductExample {
      * This method corresponds to the database table litemall_product
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallProductExample orderBy(String orderByClause) {
-        this.setOrderByClause(orderByClause);
-        return this;
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
     }
 
     /**
@@ -166,18 +173,11 @@ public class LitemallProductExample {
      * This method corresponds to the database table litemall_product
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallProductExample orderBy(String ... orderByClauses) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < orderByClauses.length; i++) {
-            sb.append(orderByClauses[i]);
-            if (i < orderByClauses.length - 1) {
-                sb.append(" , ");
-            }
-        }
-        this.setOrderByClause(sb.toString());
-        return this;
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
     }
 
     /**
@@ -815,6 +815,29 @@ public class LitemallProductExample {
             return this;
         }
 
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_product
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallProduct.IS_DELETED) : andDeletedNotEqualTo(LitemallProduct.IS_DELETED);
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_product
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        @Deprecated
+        public Criteria andDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallProduct.IS_DELETED) : andDeletedNotEqualTo(LitemallProduct.IS_DELETED);
+        }
+
         /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table litemall_product

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegion.java

@@ -238,11 +238,11 @@ public class LitemallRegion {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     public enum Column {
-        id("id"),
-        pid("pid"),
-        name("name"),
-        type("type"),
-        code("code");
+        id("id", "id", "INTEGER"),
+        pid("pid", "pid", "INTEGER"),
+        name("name", "name", "VARCHAR"),
+        type("type", "type", "TINYINT"),
+        code("code", "code", "INTEGER");
 
         /**
          * This field was generated by MyBatis Generator.
@@ -253,6 +253,24 @@ public class LitemallRegion {
          */
         private final String column;
 
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_region
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_region
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_region
@@ -282,8 +300,32 @@ public class LitemallRegion {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        Column(String column) {
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_region
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_region
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType) {
             this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
         }
 
         /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegionExample.java

@@ -115,13 +115,11 @@ public class LitemallRegionExample {
      * This method corresponds to the database table litemall_region
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
+    public LitemallRegionExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
     }
 
     /**
@@ -129,10 +127,18 @@ public class LitemallRegionExample {
      * This method corresponds to the database table litemall_region
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria(this);
-        return criteria;
+    public LitemallRegionExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
     }
 
     /**
@@ -141,10 +147,12 @@ public class LitemallRegionExample {
      *
      * @mbg.generated
      */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
     }
 
     /**
@@ -152,11 +160,10 @@ public class LitemallRegionExample {
      * This method corresponds to the database table litemall_region
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallRegionExample orderBy(String orderByClause) {
-        this.setOrderByClause(orderByClause);
-        return this;
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
     }
 
     /**
@@ -164,18 +171,11 @@ public class LitemallRegionExample {
      * This method corresponds to the database table litemall_region
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallRegionExample orderBy(String ... orderByClauses) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < orderByClauses.length; i++) {
-            sb.append(orderByClauses[i]);
-            if (i < orderByClauses.length - 1) {
-                sb.append(" , ");
-            }
-        }
-        this.setOrderByClause(sb.toString());
-        return this;
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
     }
 
     /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistory.java

@@ -3,6 +3,44 @@ package org.linlinjava.litemall.db.domain;
 import java.time.LocalDateTime;
 
 public class LitemallSearchHistory {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_search_history
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean NOT_DELETED = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_search_history
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_ON = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_search_history
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean IS_DELETED = true;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_search_history
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_OFF = true;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -268,6 +306,17 @@ public class LitemallSearchHistory {
         return result;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_search_history
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? IS_DELETED : NOT_DELETED);
+    }
+
     /**
      * This enum was generated by MyBatis Generator.
      * This enum corresponds to the database table litemall_search_history
@@ -276,12 +325,12 @@ public class LitemallSearchHistory {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     public enum Column {
-        id("id"),
-        userId("user_id"),
-        keyword("keyword"),
-        from("from"),
-        addTime("add_time"),
-        deleted("deleted");
+        id("id", "id", "INTEGER"),
+        userId("user_id", "userId", "INTEGER"),
+        keyword("keyword", "keyword", "CHAR"),
+        from("from", "from", "VARCHAR"),
+        addTime("add_time", "addTime", "TIMESTAMP"),
+        deleted("deleted", "deleted", "BIT");
 
         /**
          * This field was generated by MyBatis Generator.
@@ -292,6 +341,24 @@ public class LitemallSearchHistory {
          */
         private final String column;
 
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_search_history
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_search_history
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_search_history
@@ -321,8 +388,32 @@ public class LitemallSearchHistory {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        Column(String column) {
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_search_history
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_search_history
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType) {
             this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
         }
 
         /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistoryExample.java

@@ -116,13 +116,11 @@ public class LitemallSearchHistoryExample {
      * This method corresponds to the database table litemall_search_history
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
+    public LitemallSearchHistoryExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
     }
 
     /**
@@ -130,10 +128,18 @@ public class LitemallSearchHistoryExample {
      * This method corresponds to the database table litemall_search_history
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria(this);
-        return criteria;
+    public LitemallSearchHistoryExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
     }
 
     /**
@@ -142,10 +148,12 @@ public class LitemallSearchHistoryExample {
      *
      * @mbg.generated
      */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
     }
 
     /**
@@ -153,11 +161,10 @@ public class LitemallSearchHistoryExample {
      * This method corresponds to the database table litemall_search_history
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallSearchHistoryExample orderBy(String orderByClause) {
-        this.setOrderByClause(orderByClause);
-        return this;
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
     }
 
     /**
@@ -165,18 +172,11 @@ public class LitemallSearchHistoryExample {
      * This method corresponds to the database table litemall_search_history
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallSearchHistoryExample orderBy(String ... orderByClauses) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < orderByClauses.length; i++) {
-            sb.append(orderByClauses[i]);
-            if (i < orderByClauses.length - 1) {
-                sb.append(" , ");
-            }
-        }
-        this.setOrderByClause(sb.toString());
-        return this;
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
     }
 
     /**
@@ -660,6 +660,29 @@ public class LitemallSearchHistoryExample {
             return this;
         }
 
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_search_history
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallSearchHistory.IS_DELETED) : andDeletedNotEqualTo(LitemallSearchHistory.IS_DELETED);
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_search_history
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        @Deprecated
+        public Criteria andDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallSearchHistory.IS_DELETED) : andDeletedNotEqualTo(LitemallSearchHistory.IS_DELETED);
+        }
+
         /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table litemall_search_history

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java

@@ -3,6 +3,44 @@ package org.linlinjava.litemall.db.domain;
 import java.time.LocalDateTime;
 
 public class LitemallStorage {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_storage
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean NOT_DELETED = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_storage
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_ON = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_storage
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean IS_DELETED = true;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_storage
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_OFF = true;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -376,6 +414,17 @@ public class LitemallStorage {
         return result;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_storage
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? IS_DELETED : NOT_DELETED);
+    }
+
     /**
      * This enum was generated by MyBatis Generator.
      * This enum corresponds to the database table litemall_storage
@@ -384,15 +433,15 @@ public class LitemallStorage {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     public enum Column {
-        id("id"),
-        key("key"),
-        name("name"),
-        type("type"),
-        size("size"),
-        modified("modified"),
-        url("url"),
-        addTime("add_time"),
-        deleted("deleted");
+        id("id", "id", "INTEGER"),
+        key("key", "key", "VARCHAR"),
+        name("name", "name", "VARCHAR"),
+        type("type", "type", "VARCHAR"),
+        size("size", "size", "INTEGER"),
+        modified("modified", "modified", "TIMESTAMP"),
+        url("url", "url", "VARCHAR"),
+        addTime("add_time", "addTime", "TIMESTAMP"),
+        deleted("deleted", "deleted", "BIT");
 
         /**
          * This field was generated by MyBatis Generator.
@@ -403,6 +452,24 @@ public class LitemallStorage {
          */
         private final String column;
 
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_storage
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_storage
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_storage
@@ -432,8 +499,32 @@ public class LitemallStorage {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        Column(String column) {
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_storage
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_storage
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType) {
             this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
         }
 
         /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java

@@ -116,13 +116,11 @@ public class LitemallStorageExample {
      * This method corresponds to the database table litemall_storage
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
+    public LitemallStorageExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
     }
 
     /**
@@ -130,10 +128,18 @@ public class LitemallStorageExample {
      * This method corresponds to the database table litemall_storage
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria(this);
-        return criteria;
+    public LitemallStorageExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
     }
 
     /**
@@ -142,10 +148,12 @@ public class LitemallStorageExample {
      *
      * @mbg.generated
      */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
     }
 
     /**
@@ -153,11 +161,10 @@ public class LitemallStorageExample {
      * This method corresponds to the database table litemall_storage
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallStorageExample orderBy(String orderByClause) {
-        this.setOrderByClause(orderByClause);
-        return this;
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
     }
 
     /**
@@ -165,18 +172,11 @@ public class LitemallStorageExample {
      * This method corresponds to the database table litemall_storage
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallStorageExample orderBy(String ... orderByClauses) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < orderByClauses.length; i++) {
-            sb.append(orderByClauses[i]);
-            if (i < orderByClauses.length - 1) {
-                sb.append(" , ");
-            }
-        }
-        this.setOrderByClause(sb.toString());
-        return this;
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
     }
 
     /**
@@ -860,6 +860,29 @@ public class LitemallStorageExample {
             return this;
         }
 
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_storage
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallStorage.IS_DELETED) : andDeletedNotEqualTo(LitemallStorage.IS_DELETED);
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_storage
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        @Deprecated
+        public Criteria andDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallStorage.IS_DELETED) : andDeletedNotEqualTo(LitemallStorage.IS_DELETED);
+        }
+
         /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table litemall_storage

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java

@@ -4,6 +4,44 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 public class LitemallTopic {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_topic
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean NOT_DELETED = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_topic
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_ON = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_topic
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean IS_DELETED = true;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_topic
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_OFF = true;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -521,6 +559,17 @@ public class LitemallTopic {
         return result;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_topic
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? IS_DELETED : NOT_DELETED);
+    }
+
     /**
      * This enum was generated by MyBatis Generator.
      * This enum corresponds to the database table litemall_topic
@@ -529,19 +578,19 @@ public class LitemallTopic {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     public enum Column {
-        id("id"),
-        title("title"),
-        avatar("avatar"),
-        itemPicUrl("item_pic_url"),
-        subtitle("subtitle"),
-        priceInfo("price_info"),
-        readCount("read_count"),
-        scenePicUrl("scene_pic_url"),
-        sortOrder("sort_order"),
-        isShow("is_show"),
-        addTime("add_time"),
-        deleted("deleted"),
-        content("content");
+        id("id", "id", "INTEGER"),
+        title("title", "title", "VARCHAR"),
+        avatar("avatar", "avatar", "VARCHAR"),
+        itemPicUrl("item_pic_url", "itemPicUrl", "VARCHAR"),
+        subtitle("subtitle", "subtitle", "VARCHAR"),
+        priceInfo("price_info", "priceInfo", "DECIMAL"),
+        readCount("read_count", "readCount", "VARCHAR"),
+        scenePicUrl("scene_pic_url", "scenePicUrl", "VARCHAR"),
+        sortOrder("sort_order", "sortOrder", "INTEGER"),
+        isShow("is_show", "isShow", "BIT"),
+        addTime("add_time", "addTime", "TIMESTAMP"),
+        deleted("deleted", "deleted", "BIT"),
+        content("content", "content", "LONGVARCHAR");
 
         /**
          * This field was generated by MyBatis Generator.
@@ -552,6 +601,24 @@ public class LitemallTopic {
          */
         private final String column;
 
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_topic
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_topic
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_topic
@@ -581,8 +648,32 @@ public class LitemallTopic {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        Column(String column) {
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_topic
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_topic
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType) {
             this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
         }
 
         /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java

@@ -117,13 +117,11 @@ public class LitemallTopicExample {
      * This method corresponds to the database table litemall_topic
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
+    public LitemallTopicExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
     }
 
     /**
@@ -131,10 +129,18 @@ public class LitemallTopicExample {
      * This method corresponds to the database table litemall_topic
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria(this);
-        return criteria;
+    public LitemallTopicExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
     }
 
     /**
@@ -143,10 +149,12 @@ public class LitemallTopicExample {
      *
      * @mbg.generated
      */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
     }
 
     /**
@@ -154,11 +162,10 @@ public class LitemallTopicExample {
      * This method corresponds to the database table litemall_topic
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallTopicExample orderBy(String orderByClause) {
-        this.setOrderByClause(orderByClause);
-        return this;
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
     }
 
     /**
@@ -166,18 +173,11 @@ public class LitemallTopicExample {
      * This method corresponds to the database table litemall_topic
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallTopicExample orderBy(String ... orderByClauses) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < orderByClauses.length; i++) {
-            sb.append(orderByClauses[i]);
-            if (i < orderByClauses.length - 1) {
-                sb.append(" , ");
-            }
-        }
-        this.setOrderByClause(sb.toString());
-        return this;
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
     }
 
     /**
@@ -1061,6 +1061,29 @@ public class LitemallTopicExample {
             return this;
         }
 
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_topic
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallTopic.IS_DELETED) : andDeletedNotEqualTo(LitemallTopic.IS_DELETED);
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_topic
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        @Deprecated
+        public Criteria andDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallTopic.IS_DELETED) : andDeletedNotEqualTo(LitemallTopic.IS_DELETED);
+        }
+
         /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table litemall_topic

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java

@@ -4,6 +4,44 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 public class LitemallUser {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean NOT_DELETED = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_ON = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean IS_DELETED = true;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_OFF = true;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -629,6 +667,17 @@ public class LitemallUser {
         return result;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_user
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? IS_DELETED : NOT_DELETED);
+    }
+
     /**
      * This enum was generated by MyBatis Generator.
      * This enum corresponds to the database table litemall_user
@@ -637,22 +686,22 @@ public class LitemallUser {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     public enum Column {
-        id("id"),
-        username("username"),
-        password("password"),
-        gender("gender"),
-        birthday("birthday"),
-        lastLoginTime("last_login_time"),
-        lastLoginIp("last_login_ip"),
-        userLevel("user_level"),
-        nickname("nickname"),
-        mobile("mobile"),
-        registerIp("register_ip"),
-        avatar("avatar"),
-        weixinOpenid("weixin_openid"),
-        status("status"),
-        addTime("add_time"),
-        deleted("deleted");
+        id("id", "id", "INTEGER"),
+        username("username", "username", "VARCHAR"),
+        password("password", "password", "VARCHAR"),
+        gender("gender", "gender", "VARCHAR"),
+        birthday("birthday", "birthday", "DATE"),
+        lastLoginTime("last_login_time", "lastLoginTime", "TIMESTAMP"),
+        lastLoginIp("last_login_ip", "lastLoginIp", "VARCHAR"),
+        userLevel("user_level", "userLevel", "VARCHAR"),
+        nickname("nickname", "nickname", "VARCHAR"),
+        mobile("mobile", "mobile", "VARCHAR"),
+        registerIp("register_ip", "registerIp", "VARCHAR"),
+        avatar("avatar", "avatar", "VARCHAR"),
+        weixinOpenid("weixin_openid", "weixinOpenid", "VARCHAR"),
+        status("status", "status", "VARCHAR"),
+        addTime("add_time", "addTime", "TIMESTAMP"),
+        deleted("deleted", "deleted", "BIT");
 
         /**
          * This field was generated by MyBatis Generator.
@@ -663,6 +712,24 @@ public class LitemallUser {
          */
         private final String column;
 
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_user
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_user
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_user
@@ -692,8 +759,32 @@ public class LitemallUser {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        Column(String column) {
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType) {
             this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
         }
 
         /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCoupon.java

@@ -3,6 +3,44 @@ package org.linlinjava.litemall.db.domain;
 import java.time.LocalDateTime;
 
 public class LitemallUserCoupon {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user_coupon
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean NOT_DELETED = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user_coupon
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_ON = false;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user_coupon
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static final Boolean IS_DELETED = true;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table litemall_user_coupon
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    @Deprecated
+    public static final Boolean DEL_FLAG_OFF = true;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -304,6 +342,17 @@ public class LitemallUserCoupon {
         return result;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table litemall_user_coupon
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public void andLogicalDeleted(boolean deleted) {
+        setDeleted(deleted ? IS_DELETED : NOT_DELETED);
+    }
+
     /**
      * This enum was generated by MyBatis Generator.
      * This enum corresponds to the database table litemall_user_coupon
@@ -312,13 +361,13 @@ public class LitemallUserCoupon {
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
     public enum Column {
-        id("id"),
-        couponId("coupon_id"),
-        userId("user_id"),
-        orderId("order_id"),
-        usedTime("used_time"),
-        addTime("add_time"),
-        deleted("deleted");
+        id("id", "id", "INTEGER"),
+        couponId("coupon_id", "couponId", "INTEGER"),
+        userId("user_id", "userId", "INTEGER"),
+        orderId("order_id", "orderId", "INTEGER"),
+        usedTime("used_time", "usedTime", "TIMESTAMP"),
+        addTime("add_time", "addTime", "TIMESTAMP"),
+        deleted("deleted", "deleted", "BIT");
 
         /**
          * This field was generated by MyBatis Generator.
@@ -329,6 +378,24 @@ public class LitemallUserCoupon {
          */
         private final String column;
 
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_user_coupon
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table litemall_user_coupon
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
         /**
          * This method was generated by MyBatis Generator.
          * This method corresponds to the database table litemall_user_coupon
@@ -358,8 +425,32 @@ public class LitemallUserCoupon {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        Column(String column) {
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user_coupon
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user_coupon
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType) {
             this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
         }
 
         /**

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCouponExample.java

@@ -116,13 +116,11 @@ public class LitemallUserCouponExample {
      * This method corresponds to the database table litemall_user_coupon
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
+    public LitemallUserCouponExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
     }
 
     /**
@@ -130,10 +128,18 @@ public class LitemallUserCouponExample {
      * This method corresponds to the database table litemall_user_coupon
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria(this);
-        return criteria;
+    public LitemallUserCouponExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
     }
 
     /**
@@ -142,10 +148,12 @@ public class LitemallUserCouponExample {
      *
      * @mbg.generated
      */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
     }
 
     /**
@@ -153,11 +161,10 @@ public class LitemallUserCouponExample {
      * This method corresponds to the database table litemall_user_coupon
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallUserCouponExample orderBy(String orderByClause) {
-        this.setOrderByClause(orderByClause);
-        return this;
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
     }
 
     /**
@@ -165,18 +172,11 @@ public class LitemallUserCouponExample {
      * This method corresponds to the database table litemall_user_coupon
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallUserCouponExample orderBy(String ... orderByClauses) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < orderByClauses.length; i++) {
-            sb.append(orderByClauses[i]);
-            if (i < orderByClauses.length - 1) {
-                sb.append(" , ");
-            }
-        }
-        this.setOrderByClause(sb.toString());
-        return this;
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
     }
 
     /**
@@ -700,6 +700,29 @@ public class LitemallUserCouponExample {
             return this;
         }
 
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user_coupon
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallUserCoupon.IS_DELETED) : andDeletedNotEqualTo(LitemallUserCoupon.IS_DELETED);
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user_coupon
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        @Deprecated
+        public Criteria andDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallUserCoupon.IS_DELETED) : andDeletedNotEqualTo(LitemallUserCoupon.IS_DELETED);
+        }
+
         /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table litemall_user_coupon

litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java

@@ -117,13 +117,11 @@ public class LitemallUserExample {
      * This method corresponds to the database table litemall_user
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
+    public LitemallUserExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
     }
 
     /**
@@ -131,10 +129,18 @@ public class LitemallUserExample {
      * This method corresponds to the database table litemall_user
      *
      * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria(this);
-        return criteria;
+    public LitemallUserExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
     }
 
     /**
@@ -143,10 +149,12 @@ public class LitemallUserExample {
      *
      * @mbg.generated
      */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
     }
 
     /**
@@ -154,11 +162,10 @@ public class LitemallUserExample {
      * This method corresponds to the database table litemall_user
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallUserExample orderBy(String orderByClause) {
-        this.setOrderByClause(orderByClause);
-        return this;
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
     }
 
     /**
@@ -166,18 +173,11 @@ public class LitemallUserExample {
      * This method corresponds to the database table litemall_user
      *
      * @mbg.generated
-     * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    public LitemallUserExample orderBy(String ... orderByClauses) {
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < orderByClauses.length; i++) {
-            sb.append(orderByClauses[i]);
-            if (i < orderByClauses.length - 1) {
-                sb.append(" , ");
-            }
-        }
-        this.setOrderByClause(sb.toString());
-        return this;
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
     }
 
     /**
@@ -1351,6 +1351,29 @@ public class LitemallUserExample {
             return this;
         }
 
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andLogicalDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallUser.IS_DELETED) : andDeletedNotEqualTo(LitemallUser.IS_DELETED);
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table litemall_user
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        @Deprecated
+        public Criteria andDeleted(boolean deleted) {
+            return deleted ? andDeletedEqualTo(LitemallUser.IS_DELETED) : andDeletedNotEqualTo(LitemallUser.IS_DELETED);
+        }
+
         /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table litemall_user

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

@@ -120,9 +120,17 @@
     <if test="example.distinct">
       distinct
     </if>
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `position`, `name`, link, url, content, start_time, end_time, enabled, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_ad
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -141,6 +149,30 @@
     from litemall_ad
     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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_ad
+    where id = #{id,jdbcType=INTEGER}
+      and deleted = 
+    <choose>
+      <when test="andLogicalDeleted">
+        '1'
+      </when>
+      <otherwise>
+        '0'
+      </otherwise>
+    </choose>
+  </select>
   <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
@@ -148,9 +180,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `position`, `name`, link, url, content, start_time, end_time, enabled, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_ad
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -421,9 +461,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `position`, `name`, link, url, content, start_time, end_time, enabled, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_ad
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -433,4 +481,24 @@
     </if>
     limit 1
   </select>
+  <update id="logicalDeleteByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_ad set deleted = 1
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_ad set deleted = 1
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -120,9 +120,17 @@
     <if test="example.distinct">
       distinct
     </if>
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, user_id, province_id, city_id, area_id, address, mobile, is_default, 
+          add_time, deleted
+      </otherwise>
+    </choose>
     from litemall_address
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -141,6 +149,30 @@
     from litemall_address
     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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_address
+    where id = #{id,jdbcType=INTEGER}
+      and deleted = 
+    <choose>
+      <when test="andLogicalDeleted">
+        '1'
+      </when>
+      <otherwise>
+        '0'
+      </otherwise>
+    </choose>
+  </select>
   <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
@@ -148,9 +180,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, user_id, province_id, city_id, area_id, address, mobile, is_default, 
+          add_time, deleted
+      </otherwise>
+    </choose>
     from litemall_address
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -421,9 +461,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, user_id, province_id, city_id, area_id, address, mobile, is_default, 
+          add_time, deleted
+      </otherwise>
+    </choose>
     from litemall_address
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -433,4 +481,24 @@
     </if>
     limit 1
   </select>
+  <update id="logicalDeleteByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_address set deleted = 1
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_address set deleted = 1
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -118,9 +118,17 @@
     <if test="example.distinct">
       distinct
     </if>
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, username, `password`, last_login_ip, last_login_time, update_time, avatar, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_admin
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -139,6 +147,30 @@
     from litemall_admin
     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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_admin
+    where id = #{id,jdbcType=INTEGER}
+      and deleted = 
+    <choose>
+      <when test="andLogicalDeleted">
+        '1'
+      </when>
+      <otherwise>
+        '0'
+      </otherwise>
+    </choose>
+  </select>
   <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
@@ -146,9 +178,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, username, `password`, last_login_ip, last_login_time, update_time, avatar, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_admin
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -389,9 +429,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, username, `password`, last_login_ip, last_login_time, update_time, avatar, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_admin
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -401,4 +449,24 @@
     </if>
     limit 1
   </select>
+  <update id="logicalDeleteByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_admin set deleted = 1
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_admin set deleted = 1
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -123,9 +123,17 @@
     <if test="example.distinct">
       distinct
     </if>
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, list_pic_url, simple_desc, pic_url, sort_order, is_show, floor_price, 
+          app_list_pic_url, is_new, new_pic_url, new_sort_order, add_time, deleted
+      </otherwise>
+    </choose>
     from litemall_brand
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -144,6 +152,30 @@
     from litemall_brand
     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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_brand
+    where id = #{id,jdbcType=INTEGER}
+      and deleted = 
+    <choose>
+      <when test="andLogicalDeleted">
+        '1'
+      </when>
+      <otherwise>
+        '0'
+      </otherwise>
+    </choose>
+  </select>
   <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
@@ -151,9 +183,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, list_pic_url, simple_desc, pic_url, sort_order, is_show, floor_price, 
+          app_list_pic_url, is_new, new_pic_url, new_sort_order, add_time, deleted
+      </otherwise>
+    </choose>
     from litemall_brand
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -468,9 +508,17 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, list_pic_url, simple_desc, pic_url, sort_order, is_show, floor_price, 
+          app_list_pic_url, is_new, new_pic_url, new_sort_order, add_time, deleted
+      </otherwise>
+    </choose>
     from litemall_brand
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -480,4 +528,24 @@
     </if>
     limit 1
   </select>
+  <update id="logicalDeleteByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_brand set deleted = 1
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_brand set deleted = 1
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -162,9 +162,18 @@
     <if test="example.distinct">
       distinct
     </if>
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, user_id, goods_id, goods_sn, product_id, goods_name, retail_price, `number`, 
+          goods_specification_values, goods_specification_ids, `checked`, pic_url, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_cart
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -183,6 +192,30 @@
     from litemall_cart
     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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_cart
+    where id = #{id,jdbcType=INTEGER}
+      and deleted = 
+    <choose>
+      <when test="andLogicalDeleted">
+        '1'
+      </when>
+      <otherwise>
+        '0'
+      </otherwise>
+    </choose>
+  </select>
   <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
@@ -190,9 +223,18 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, user_id, goods_id, goods_sn, product_id, goods_name, retail_price, `number`, 
+          goods_specification_values, goods_specification_ids, `checked`, pic_url, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_cart
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -507,9 +549,18 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, user_id, goods_id, goods_sn, product_id, goods_name, retail_price, `number`, 
+          goods_specification_values, goods_specification_ids, `checked`, pic_url, add_time, 
+          deleted
+      </otherwise>
+    </choose>
     from litemall_cart
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -519,4 +570,24 @@
     </if>
     limit 1
   </select>
+  <update id="logicalDeleteByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_cart set deleted = 1
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_cart set deleted = 1
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file

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

@@ -126,9 +126,18 @@
     <if test="example.distinct">
       distinct
     </if>
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, keywords, front_desc, parent_id, sort_order, show_index, is_show, banner_url, 
+          icon_url, img_url, wap_banner_url, `level`, `type`, front_name, add_time, deleted
+          
+      </otherwise>
+    </choose>
     from litemall_category
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -147,6 +156,30 @@
     from litemall_category
     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.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from litemall_category
+    where id = #{id,jdbcType=INTEGER}
+      and deleted = 
+    <choose>
+      <when test="andLogicalDeleted">
+        '1'
+      </when>
+      <otherwise>
+        '0'
+      </otherwise>
+    </choose>
+  </select>
   <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
@@ -154,9 +187,18 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, keywords, front_desc, parent_id, sort_order, show_index, is_show, banner_url, 
+          icon_url, img_url, wap_banner_url, `level`, `type`, front_name, add_time, deleted
+          
+      </otherwise>
+    </choose>
     from litemall_category
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -515,9 +557,18 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     select
-    <foreach collection="selective" item="column" separator=",">
-      ${column.value}
-    </foreach>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.value}
+        </foreach>
+      </when>
+      <otherwise>
+        id, `name`, keywords, front_desc, parent_id, sort_order, show_index, is_show, banner_url, 
+          icon_url, img_url, wap_banner_url, `level`, `type`, front_name, add_time, deleted
+          
+      </otherwise>
+    </choose>
     from litemall_category
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -527,4 +578,24 @@
     </if>
     limit 1
   </select>
+  <update id="logicalDeleteByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_category set deleted = 1
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    update litemall_category set deleted = 1
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>
\ No newline at end of file