diff --git a/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java b/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java
index dec993f1..7f668084 100644
--- a/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java
@@ -9,25 +9,22 @@
 package co.yixiang.gen.domain;
 
 import co.yixiang.gen.utils.GenUtil;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-
 /**
  * 列的数据信息
  * @author Zheng Jie
  * @date 2019-01-02
  */
 @Data
-@Entity
 @NoArgsConstructor
-@Table(name = "column_config")
+@TableName("column_config")
 public class ColumnConfig {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
+    @TableId
     private Long id;
 
     private String tableName;
diff --git a/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java b/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java
index c2a08a97..b396a0c6 100644
--- a/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java
@@ -8,10 +8,10 @@
  */
 package co.yixiang.gen.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import javax.persistence.*;
-import javax.validation.constraints.NotBlank;
 
 /**
  * 代码生成配置
@@ -19,9 +19,8 @@ import javax.validation.constraints.NotBlank;
  * @date 2019-01-03
  */
 @Data
-@Entity
 @NoArgsConstructor
-@Table(name = "gen_config")
+@TableName("gen_config")
 public class GenConfig {
 
     public GenConfig(String tableName) {
@@ -30,32 +29,25 @@ public class GenConfig {
         this.tableName = tableName;
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
+    @TableId
     private Long id;
 
-    @NotBlank
+    /**表明**/
     private String tableName;
 
     /** 接口名称 **/
     private String apiAlias;
 
     /** 包路径 */
-    @NotBlank
     private String pack;
 
     /** 模块名 */
-    @Column(name = "module_name")
-    @NotBlank
     private String moduleName;
 
     /** 前端文件路径 */
-    @NotBlank
     private String path;
 
     /** 前端文件路径 */
-    @Column(name = "api_path")
     private String apiPath;
 
     /** 作者 */
diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java
index c02635d8..e317d1bb 100644
--- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxArticle.java
@@ -7,125 +7,101 @@
  * 一经发现盗用、分享等行为，将追究法律责任，后果自负
  */
 package co.yixiang.mp.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
 * @author hupeng
 * @date 2020-05-12
 */
-@Entity
 @Data
-@Table(name="yx_article")
+@TableName("yx_article")
 public class YxArticle implements Serializable {
 
     /** 文章管理ID */
-    @Id
-
-    @Column(name = "id")
+    @TableId
     private Integer id;
 
 
     /** 分类id */
-    @Column(name = "cid")
     private String cid;
 
 
     /** 文章标题 */
-    @Column(name = "title",nullable = false)
-    @NotBlank
     private String title;
 
 
     /** 文章作者 */
-    @Column(name = "author")
     private String author;
 
 
     /** 文章图片 */
-    @Column(name = "image_input",nullable = false)
-    @NotBlank
     private String imageInput;
 
 
     /** 文章简介 */
-    @Column(name = "synopsis")
     private String synopsis;
 
 
-    @Column(name = "content")
     private String content;
 
 
     /** 文章分享标题 */
-    @Column(name = "share_title")
     private String shareTitle;
 
 
     /** 文章分享简介 */
-    @Column(name = "share_synopsis")
     private String shareSynopsis;
 
 
     /** 浏览次数 */
-    @Column(name = "visit")
     private String visit;
 
 
     /** 排序 */
-    @Column(name = "sort")
     private Integer sort;
 
 
     /** 原文链接 */
-    @Column(name = "url")
     private String url;
 
 
     /** 状态 */
-    @Column(name = "status")
     private Integer status;
 
 
     /** 添加时间 */
-    @Column(name = "add_time")
+    @TableField(fill= FieldFill.INSERT)
     private String addTime;
 
 
     /** 是否隐藏 */
-    @Column(name = "hide")
     private Integer hide;
 
 
     /** 管理员id */
-    @Column(name = "admin_id")
     private Integer adminId;
 
 
     /** 商户id */
-    @Column(name = "mer_id")
     private Integer merId;
 
 
     /** 产品关联id */
-    @Column(name = "product_id")
     private Integer productId;
 
 
     /** 是否热门(小程序) */
-    @Column(name = "is_hot")
     private Integer isHot;
 
 
     /** 是否轮播图(小程序) */
-    @Column(name = "is_banner")
     private Integer isBanner;
 
 
diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java
index 8b829f3c..5a03e136 100644
--- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java
@@ -11,31 +11,26 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
 * @author hupeng
 * @date 2020-05-12
 */
-@Entity
 @Data
-@Table(name="yx_wechat_menu")
+@TableName("yx_wechat_menu")
 public class YxWechatMenu implements Serializable {
 
-    @Id
     @TableId(value = "`key`")
     private String key;
 
 
     /** 缓存数据 */
-    @Column(name = "result")
     private String result;
 
 
     /** 缓存时间 */
-    @Column(name = "add_time")
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java
index 49a2ec76..fc560f45 100644
--- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java
@@ -7,58 +7,45 @@
  * 一经发现盗用、分享等行为，将追究法律责任，后果自负
  */
 package co.yixiang.mp.domain;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
 * @author hupeng
 * @date 2020-05-12
 */
-@Entity
 @Data
-@Table(name="yx_wechat_reply")
+@TableName("yx_wechat_reply")
 public class YxWechatReply implements Serializable {
 
     /** 微信关键字回复id */
-    @Id
-
-    @Column(name = "id")
+    @TableId
     private Integer id;
 
 
     /** 关键字 */
     @TableField(value = "`key`")
-    @NotBlank
     private String key;
 
 
     /** 回复类型 */
-    @Column(name = "type",nullable = false)
-    @NotBlank
     private String type;
 
 
     /** 回复数据 */
-    @Column(name = "data",nullable = false)
-    @NotBlank
     private String data;
 
 
     /** 0=不可用  1 =可用 */
-    @Column(name = "status",nullable = false)
-    @NotNull
     private Integer status;
 
 
     /** 是否隐藏 */
-    @Column(name = "hide")
     private Integer hide;
 
 
diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java
index 5002fea5..43bf0201 100644
--- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatTemplate.java
@@ -7,7 +7,9 @@
  * 一经发现盗用、分享等行为，将追究法律责任，后果自负
  */
 package co.yixiang.mp.domain;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -21,50 +23,37 @@ import java.io.Serializable;
 * @author hupeng
 * @date 2020-05-12
 */
-@Entity
 @Data
-@Table(name="yx_wechat_template")
+@TableName("yx_wechat_template")
 public class YxWechatTemplate implements Serializable {
 
     /** 模板id */
-    @Id
-
-    @Column(name = "id")
+    @TableId
     private Integer id;
 
 
     /** 模板编号 */
-    @Column(name = "tempkey",nullable = false)
-    @NotBlank
     private String tempkey;
 
 
     /** 模板名 */
-    @Column(name = "name",nullable = false)
-    @NotBlank
     private String name;
 
 
     /** 回复内容 */
-    @Column(name = "content",nullable = false)
-    @NotBlank
     private String content;
 
 
     /** 模板ID */
-    @Column(name = "tempid")
     private String tempid;
 
 
     /** 添加时间 */
-    @Column(name = "add_time",nullable = false)
-    @NotBlank
+    @TableField(fill= FieldFill.INSERT)
     private String addTime;
 
 
     /** 状态 */
-    @Column(name = "status",nullable = false)
-    @NotNull
     private Integer status;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java
index 17bc353c..8036ec8f 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java
@@ -24,32 +24,22 @@ public class YxExpress implements Serializable {
 
     /** 快递公司id */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 快递公司简称 */
-    //@Column(name = "code",unique = true,nullable = false)
-    //@NotBlank
     private String code;
 
 
     /** 快递公司全称 */
-    //@Column(name = "name",nullable = false)
-    //@NotBlank
     private String name;
 
 
     /** 排序 */
-    //@Column(name = "sort",nullable = false)
-   //@NotNull
     private Integer sort;
 
 
     /** 是否显示 */
-    //@Column(name = "is_show",nullable = false)
-   //@NotNull
     private Integer isShow;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java
index c851169e..4ff5a55b 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
@@ -27,62 +25,35 @@ public class YxMaterial implements Serializable {
 
     /** PK */
     @TableId
-    //@Column(name = "id")
     private String id;
 
-
-    /** 所属租户 */
-    //@Column(name = "user_id",nullable = false)
-    //@NotBlank
-    private String userId;
-
-
     /** 逻辑删除标记（0：显示；1：隐藏） */
-    //@Column(name = "del_flag",nullable = false)
-    //@NotBlank
     @TableLogic
     @TableField(fill=FieldFill.INSERT_UPDATE)
     private Boolean delFlag;
 
 
     /** 创建时间 */
-    //@Column(name = "create_time",nullable = false)
-   //@NotNull
     @TableField(fill= FieldFill.INSERT)
     private Timestamp createTime;
 
-
-    /** 最后更新时间 */
-    //@Column(name = "update_time",nullable = false)
-   //@NotNull
-    @TableField(fill= FieldFill.INSERT_UPDATE)
-    private Timestamp updateTime;
-
-
     /** 创建者ID */
-    //@Column(name = "create_id")
     private String createId;
 
 
     /** 类型1、图片；2、视频 */
-    //@Column(name = "type",nullable = false)
-    //@NotBlank
     private String type;
 
 
     /** 分组ID */
-    //@Column(name = "group_id")
     private String groupId;
 
 
     /** 素材名 */
-    //@Column(name = "name",nullable = false)
-    //@NotBlank
     private String name;
 
 
     /** 素材链接 */
-    //@Column(name = "url")
     private String url;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java
index 72e09712..0cdb280e 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java
@@ -25,46 +25,23 @@ public class YxMaterialGroup implements Serializable {
 
     /** PK */
     @TableId
-    //@Column(name = "id")
     private String id;
 
-
-    /** 所属租户 */
-    //@Column(name = "user_id",nullable = false)
-    //@NotBlank
-    private String userId;
-
-
     /** 逻辑删除标记（0：显示；1：隐藏） */
-    //@Column(name = "del_flag",nullable = false)
-    //@NotBlank
     @TableLogic
     @TableField(fill=FieldFill.INSERT_UPDATE)
     private Boolean delFlag;
 
 
     /** 创建时间 */
-    //@Column(name = "create_time",nullable = false)
-   //@NotNull
     @TableField(fill= FieldFill.INSERT)
     private Timestamp createTime;
 
-
-    /** 最后更新时间 */
-    //@Column(name = "update_time",nullable = false)
-   //@NotNull
-    @TableField(fill= FieldFill.INSERT_UPDATE)
-    private Timestamp updateTime;
-
-
     /** 创建者ID */
-    //@Column(name = "create_id")
     private String createId;
 
 
     /** 分组名 */
-    //@Column(name = "name",nullable = false)
-    //@NotBlank
     private String name;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java
index b67d6822..6a89076c 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java
@@ -24,62 +24,42 @@ public class YxStoreCart implements Serializable {
 
     /** 购物车表ID */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Long id;
 
 
     /** 用户ID */
-    //@Column(name = "uid",nullable = false)
-   //@NotNull
     private Integer uid;
 
 
     /** 类型 */
-    //@Column(name = "type",nullable = false)
-    //@NotBlank
     private String type;
 
 
     /** 商品ID */
-    //@Column(name = "product_id",nullable = false)
-   //@NotNull
     private Integer productId;
 
 
     /** 商品属性 */
-    //@Column(name = "product_attr_unique",nullable = false)
-    //@NotBlank
     private String productAttrUnique;
 
 
     /** 商品数量 */
-    //@Column(name = "cart_num",nullable = false)
-   //@NotNull
     private Integer cartNum;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
     private Integer addTime;
 
 
     /** 0 = 未购买 1 = 已购买 */
-    //@Column(name = "is_pay",nullable = false)
-   //@NotNull
     private Integer isPay;
 
 
     /** 是否删除 */
-    //@Column(name = "is_del",nullable = false)
-   //@NotNull
     private Integer isDel;
 
 
     /** 是否为立即购买 */
-    //@Column(name = "is_new",nullable = false)
-   //@NotNull
     private Integer isNew;
 
 
@@ -89,14 +69,10 @@ public class YxStoreCart implements Serializable {
 
 
     /** 秒杀产品ID */
-    //@Column(name = "seckill_id",nullable = false)
-   //@NotNull
     private Integer seckillId;
 
 
     /** 砍价id */
-    //@Column(name = "bargain_id",nullable = false)
-   //@NotNull
     private Integer bargainId;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java
index 5e4eb017..0e6b8a81 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java
@@ -24,45 +24,34 @@ public class YxStoreCategory implements Serializable {
 
     /** 商品分类表ID */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 父id */
-    //@Column(name = "pid",nullable = false)
-   //@NotNull
     private Integer pid;
 
 
     /** 分类名称 */
-    //@Column(name = "cate_name",nullable = false)
-    //@NotBlank
     private String cateName;
 
 
     /** 排序 */
-    //@Column(name = "sort")
     private Integer sort;
 
 
     /** 图标 */
-    //@Column(name = "pic")
     private String pic;
 
 
     /** 是否推荐 */
-    //@Column(name = "is_show")
     private Integer isShow;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time")
     private Integer addTime;
 
 
     /** 删除状态 */
-    //@Column(name = "is_del")
     private Integer isDel;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java
index 7442d2a1..81b73573 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java
@@ -25,218 +25,154 @@ public class YxStoreOrder implements Serializable {
 
     /** 订单ID */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 订单号 */
-    //@Column(name = "order_id",nullable = false)
-    //@NotBlank
     private String orderId;
 
 
     /** 额外订单号 */
-    //@Column(name = "extend_order_id")
     private String extendOrderId;
 
 
     /** 用户id */
-    //@Column(name = "uid",nullable = false)
-   //@NotNull
     private Integer uid;
 
 
     /** 用户姓名 */
-    //@Column(name = "real_name",nullable = false)
-    //@NotBlank
     private String realName;
 
 
     /** 用户电话 */
-    //@Column(name = "user_phone",nullable = false)
-    //@NotBlank
     private String userPhone;
 
 
     /** 详细地址 */
-    //@Column(name = "user_address",nullable = false)
-    //@NotBlank
     private String userAddress;
 
 
     /** 购物车id */
-    //@Column(name = "cart_id",nullable = false)
-    //@NotBlank
     private String cartId;
 
 
     /** 运费金额 */
-    //@Column(name = "freight_price",nullable = false)
-   //@NotNull
     private BigDecimal freightPrice;
 
 
     /** 订单商品总数 */
-    //@Column(name = "total_num",nullable = false)
-   //@NotNull
     private Integer totalNum;
 
 
     /** 订单总价 */
-    //@Column(name = "total_price",nullable = false)
-   //@NotNull
     private BigDecimal totalPrice;
 
 
     /** 邮费 */
-    //@Column(name = "total_postage",nullable = false)
-   //@NotNull
     private BigDecimal totalPostage;
 
 
     /** 实际支付金额 */
-    //@Column(name = "pay_price",nullable = false)
-   //@NotNull
     private BigDecimal payPrice;
 
 
     /** 支付邮费 */
-    //@Column(name = "pay_postage",nullable = false)
-   //@NotNull
     private BigDecimal payPostage;
 
 
     /** 抵扣金额 */
-    //@Column(name = "deduction_price",nullable = false)
-   //@NotNull
     private BigDecimal deductionPrice;
 
 
     /** 优惠券id */
-    //@Column(name = "coupon_id",nullable = false)
-   //@NotNull
     private Integer couponId;
 
 
     /** 优惠券金额 */
-    //@Column(name = "coupon_price",nullable = false)
-   //@NotNull
     private BigDecimal couponPrice;
 
 
     /** 支付状态 */
-    //@Column(name = "paid",nullable = false)
-   //@NotNull
     private Integer paid;
 
 
     /** 支付时间 */
-    //@Column(name = "pay_time")
     private Integer payTime;
 
 
     /** 支付方式 */
-    //@Column(name = "pay_type",nullable = false)
-    //@NotBlank
     private String payType;
 
 
     /** 创建时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
     private Integer addTime;
 
 
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：待评价；-1：已退款） */
-    //@Column(name = "status",nullable = false)
-   //@NotNull
     private Integer status;
 
 
     /** 0 未退款 1 申请中 2 已退款 */
-    //@Column(name = "refund_status",nullable = false)
-   //@NotNull
     private Integer refundStatus;
 
 
     /** 退款图片 */
-    //@Column(name = "refund_reason_wap_img")
     private String refundReasonWapImg;
 
 
     /** 退款用户说明 */
-    //@Column(name = "refund_reason_wap_explain")
     private String refundReasonWapExplain;
 
 
     /** 退款时间 */
-    //@Column(name = "refund_reason_time")
     private Integer refundReasonTime;
 
 
     /** 前台退款原因 */
-    //@Column(name = "refund_reason_wap")
     private String refundReasonWap;
 
 
     /** 不退款的理由 */
-    //@Column(name = "refund_reason")
     private String refundReason;
 
 
     /** 退款金额 */
-    //@Column(name = "refund_price",nullable = false)
-   //@NotNull
     private BigDecimal refundPrice;
 
 
     /** 快递公司编号 */
-    //@Column(name = "delivery_sn")
     private String deliverySn;
 
 
     /** 快递名称/送货人姓名 */
-    //@Column(name = "delivery_name")
     private String deliveryName;
 
 
     /** 发货类型 */
-    //@Column(name = "delivery_type")
     private String deliveryType;
 
 
     /** 快递单号/手机号 */
-    //@Column(name = "delivery_id")
     private String deliveryId;
 
 
     /** 消费赚取积分 */
-    //@Column(name = "gain_integral",nullable = false)
-   //@NotNull
     private BigDecimal gainIntegral;
 
 
     /** 使用积分 */
-    //@Column(name = "use_integral",nullable = false)
-   //@NotNull
     private BigDecimal useIntegral;
 
 
     /** 给用户退了多少积分 */
-    //@Column(name = "back_integral")
     private BigDecimal backIntegral;
 
 
     /** 备注 */
-    //@Column(name = "mark",nullable = false)
-    //@NotBlank
     private String mark;
 
 
     /** 是否删除 */
-    //@Column(name = "is_del",nullable = false)
-   //@NotNull
     private Integer isDel;
 
 
@@ -247,77 +183,55 @@ public class YxStoreOrder implements Serializable {
 
 
     /** 管理员备注 */
-    //@Column(name = "remark")
     private String remark;
 
 
     /** 商户ID */
-    //@Column(name = "mer_id",nullable = false)
-   //@NotNull
     private Integer merId;
 
 
-    //@Column(name = "is_mer_check",nullable = false)
-   //@NotNull
     private Integer isMerCheck;
 
 
     /** 拼团产品id0一般产品 */
-    //@Column(name = "combination_id")
     private Integer combinationId;
 
 
     /** 拼团id 0没有拼团 */
-    //@Column(name = "pink_id",nullable = false)
-   //@NotNull
     private Integer pinkId;
 
 
     /** 成本价 */
-    //@Column(name = "cost",nullable = false)
-   //@NotNull
     private BigDecimal cost;
 
 
     /** 秒杀产品ID */
-    //@Column(name = "seckill_id",nullable = false)
-   //@NotNull
     private Integer seckillId;
 
 
     /** 砍价id */
-    //@Column(name = "bargain_id")
     private Integer bargainId;
 
 
     /** 核销码 */
-    //@Column(name = "verify_code",nullable = false)
-    //@NotBlank
     private String verifyCode;
 
 
     /** 门店id */
-    //@Column(name = "store_id",nullable = false)
-   //@NotNull
     private Integer storeId;
 
 
     /** 配送方式 1=快递 ，2=门店自提 */
-    //@Column(name = "shipping_type",nullable = false)
-   //@NotNull
     private Integer shippingType;
 
 
     /** 支付渠道(0微信公众号1微信小程序) */
-    //@Column(name = "is_channel")
     private Integer isChannel;
 
 
-    //@Column(name = "is_remind")
     private Integer isRemind;
 
 
-    //@Column(name = "is_system_del")
     private Integer isSystemDel;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java
index b4e87041..feb7d498 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java
@@ -25,38 +25,27 @@ import java.io.Serializable;
 public class YxStoreOrderCartInfo implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 订单id */
-    //@Column(name = "oid",nullable = false)
-   //@NotNull
     private Integer oid;
 
 
     /** 购物车id */
-    //@Column(name = "cart_id",nullable = false)
-   //@NotNull
     private Integer cartId;
 
 
     /** 商品ID */
-    //@Column(name = "product_id",nullable = false)
-   //@NotNull
     private Integer productId;
 
 
     /** 购买东西的详细信息 */
-    //@Column(name = "cart_info",nullable = false)
-    //@NotBlank
     private String cartInfo;
 
 
     /** 唯一id */
-        @TableField(value = "`unique`")
-    //@NotBlank
+    @TableField(value = "`unique`")
     private String unique;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java
index d0f50826..724cc7b6 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -25,32 +23,22 @@ import java.io.Serializable;
 public class YxStoreOrderStatus implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 订单id */
-    //@Column(name = "oid",nullable = false)
-   //@NotNull
     private Integer oid;
 
 
     /** 操作类型 */
-    //@Column(name = "change_type",nullable = false)
-    //@NotBlank
     private String changeType;
 
 
     /** 操作备注 */
-    //@Column(name = "change_message",nullable = false)
-    //@NotBlank
     private String changeMessage;
 
 
     /** 操作时间 */
-    //@Column(name = "change_time",nullable = false)
-   //@NotNull
     private Integer changeTime;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java
index 14c904e1..edf0828b 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
 
@@ -27,191 +25,146 @@ public class YxStoreProduct implements Serializable {
 
     /** 商品id */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) */
-    //@Column(name = "mer_id")
     private Integer merId;
 
 
     /** 商品图片 */
-    //@Column(name = "image",nullable = false)
-    //@NotBlank
     private String image;
 
 
     /** 轮播图 */
-    //@Column(name = "slider_image",nullable = false)
-    //@NotBlank
     private String sliderImage;
 
 
     /** 商品名称 */
-    //@Column(name = "store_name",nullable = false)
-    //@NotBlank
     private String storeName;
 
 
     /** 商品简介 */
-    //@Column(name = "store_info",nullable = false)
-    //@NotBlank
     private String storeInfo;
 
 
     /** 关键字 */
-    //@Column(name = "keyword",nullable = false)
-    //@NotBlank
     private String keyword;
 
 
     /** 产品条码（一维码） */
-    //@Column(name = "bar_code")
     private String barCode;
 
 
     /** 分类id */
-    //@Column(name = "cate_id",nullable = false)
-    //@NotBlank
     private String cateId;
 
 
     /** 商品价格 */
-    //@Column(name = "price",nullable = false)
-   //@NotNull
     private BigDecimal price;
 
 
     /** 会员价格 */
-    //@Column(name = "vip_price")
     private BigDecimal vipPrice;
 
 
     /** 市场价 */
-    //@Column(name = "ot_price")
     private BigDecimal otPrice;
 
 
     /** 邮费 */
-    //@Column(name = "postage")
     private BigDecimal postage;
 
 
     /** 单位名 */
-    //@Column(name = "unit_name")
     private String unitName;
 
 
     /** 排序 */
-    //@Column(name = "sort")
     private Integer sort;
 
 
     /** 销量 */
-    //@Column(name = "sales")
     private Integer sales;
 
 
     /** 库存 */
-    //@Column(name = "stock")
     private Integer stock;
 
 
     /** 状态（0：未上架，1：上架） */
-    //@Column(name = "is_show")
     private Integer isShow;
 
 
     /** 是否热卖 */
-    //@Column(name = "is_hot")
     private Integer isHot;
 
 
     /** 是否优惠 */
-    //@Column(name = "is_benefit")
     private Integer isBenefit;
 
 
     /** 是否精品 */
-    //@Column(name = "is_best")
     private Integer isBest;
 
 
     /** 是否新品 */
-    //@Column(name = "is_new")
     private Integer isNew;
 
 
     /** 产品描述 */
-    //@Column(name = "description")
     private String description;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time")
     private Integer addTime;
 
 
     /** 是否包邮 */
-    //@Column(name = "is_postage")
     private Integer isPostage;
 
 
     /** 是否删除 */
-    //@Column(name = "is_del")
     private Integer isDel;
 
 
     /** 商户是否代理 0不可代理1可代理 */
-    //@Column(name = "mer_use")
     private Integer merUse;
 
 
     /** 获得积分 */
-    //@Column(name = "give_integral")
     private BigDecimal giveIntegral;
 
 
     /** 成本价 */
-    //@Column(name = "cost")
     private BigDecimal cost;
 
 
     /** 秒杀状态 0 未开启 1已开启 */
-    //@Column(name = "is_seckill")
     private Integer isSeckill;
 
 
     /** 砍价状态 0未开启 1开启 */
-    //@Column(name = "is_bargain")
     private Integer isBargain;
 
 
     /** 是否优品推荐 */
-    //@Column(name = "is_good")
     private Integer isGood;
 
 
     /** 虚拟销量 */
-    //@Column(name = "ficti")
     private Integer ficti;
 
 
     /** 浏览量 */
-    //@Column(name = "browse")
     private Integer browse;
 
 
     /** 产品二维码地址(用户小程序海报) */
-    //@Column(name = "code_path",nullable = false)
-    //@NotBlank
     private String codePath;
 
 
     /** 淘宝京东1688类型 */
-    //@Column(name = "soure_link")
     private String soureLink;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java
index c4741930..129e3c87 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -25,26 +23,18 @@ import java.io.Serializable;
 public class YxStoreProductAttr implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 商品ID */
-    //@Column(name = "product_id",nullable = false)
-   //@NotNull
     private Integer productId;
 
 
     /** 属性名 */
-    //@Column(name = "attr_name",nullable = false)
-    //@NotBlank
     private String attrName;
 
 
     /** 属性值 */
-    //@Column(name = "attr_values",nullable = false)
-    //@NotBlank
     private String attrValues;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java
index 74406cfc..a7243c90 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -25,26 +23,18 @@ import java.io.Serializable;
 public class YxStoreProductAttrResult implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 商品ID */
-    //@Column(name = "product_id",nullable = false)
-   //@NotNull
     private Integer productId;
 
 
     /** 商品属性参数 */
-    //@Column(name = "result",nullable = false)
-    //@NotBlank
     private String result;
 
 
     /** 上次修改时间 */
-    //@Column(name = "change_time",nullable = false)
-   //@NotNull
     private Integer changeTime;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java
index c2ab1e62..a16ca2a2 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java
@@ -26,54 +26,39 @@ import java.io.Serializable;
 public class YxStoreProductAttrValue implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 商品ID */
-    //@Column(name = "product_id",nullable = false)
-   //@NotNull
     private Integer productId;
 
 
     /** 商品属性索引值 (attr_value|attr_value[|....]) */
-    //@Column(name = "suk",nullable = false)
-    //@NotBlank
     private String suk;
 
 
     /** 属性对应的库存 */
-    //@Column(name = "stock",nullable = false)
-   //@NotNull
     private Integer stock;
 
 
     /** 销量 */
-    //@Column(name = "sales")
     private Integer sales;
 
 
     /** 属性金额 */
-    //@Column(name = "price",nullable = false)
-   //@NotNull
     private BigDecimal price;
 
 
     /** 图片 */
-    //@Column(name = "image")
     private String image;
 
 
     /** 唯一值 */
      @TableField(value = "`unique`")
-    //@NotBlank
     private String unique;
 
 
     /** 成本价 */
-    //@Column(name = "cost",nullable = false)
-   //@NotNull
     private BigDecimal cost;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java
index 37dc5057..03ed6955 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -26,90 +24,63 @@ public class YxStoreProductReply implements Serializable {
 
     /** 评论ID */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 用户ID */
-    //@Column(name = "uid",nullable = false)
-   //@NotNull
     private Integer uid;
 
 
     /** 订单ID */
-    //@Column(name = "oid",nullable = false)
-   //@NotNull
     private Integer oid;
 
 
     /** 唯一id */
-        @TableField(value = "`unique`")
-    //@NotBlank
+    @TableField(value = "`unique`")
     private String unique;
 
 
     /** 产品id */
-    //@Column(name = "product_id",nullable = false)
-   //@NotNull
     private Integer productId;
 
 
     /** 某种商品类型(普通商品、秒杀商品） */
-    //@Column(name = "reply_type",nullable = false)
-    //@NotBlank
     private String replyType;
 
 
     /** 商品分数 */
-    //@Column(name = "product_score",nullable = false)
-   //@NotNull
     private Integer productScore;
 
 
     /** 服务分数 */
-    //@Column(name = "service_score",nullable = false)
-   //@NotNull
     private Integer serviceScore;
 
 
     /** 评论内容 */
-    //@Column(name = "comment",nullable = false)
-    //@NotBlank
     private String comment;
 
 
     /** 评论图片 */
-    //@Column(name = "pics",nullable = false)
-    //@NotBlank
     private String pics;
 
 
     /** 评论时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
     private Integer addTime;
 
 
     /** 管理员回复内容 */
-    //@Column(name = "merchant_reply_content")
     private String merchantReplyContent;
 
 
     /** 管理员回复时间 */
-    //@Column(name = "merchant_reply_time")
     private Integer merchantReplyTime;
 
 
     /** 0未删除1已删除 */
-    //@Column(name = "is_del",nullable = false)
-   //@NotNull
     private Integer isDel;
 
 
     /** 0未回复1已回复 */
-    //@Column(name = "is_reply",nullable = false)
-   //@NotNull
     private Integer isReply;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java
index 5ee94a29..5a8f93c5 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -26,29 +24,22 @@ public class YxSystemConfig implements Serializable {
 
     /** 配置id */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 字段名称 */
-    //@Column(name = "menu_name",nullable = false)
-    //@NotBlank
     private String menuName;
 
 
     /** 默认值 */
-    //@Column(name = "value")
     private String value;
 
 
     /** 排序 */
-    //@Column(name = "sort")
     private Integer sort;
 
 
     /** 是否隐藏 */
-    //@Column(name = "status")
     private Integer status;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java
index ec834589..ccdda7f2 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -26,37 +24,26 @@ public class YxSystemGroupData implements Serializable {
 
     /** 组合数据详情ID */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 对应的数据名称 */
-    //@Column(name = "group_name",nullable = false)
-    //@NotBlank
     private String groupName;
 
 
     /** 数据组对应的数据值（json数据） */
-    //@Column(name = "value",nullable = false)
-    //@NotBlank
     private String value;
 
 
     /** 添加数据时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
     private Integer addTime;
 
 
     /** 数据排序 */
-    //@Column(name = "sort")
     private Integer sort;
 
 
     /** 状态（1：开启；2：关闭；） */
-    //@Column(name = "status",nullable = false)
-   //@NotNull
     private Integer status;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java
index 41208d08..8e3fef33 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -25,86 +23,59 @@ import java.io.Serializable;
 public class YxSystemStore implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 门店名称 */
-    //@Column(name = "name",nullable = false)
-    //@NotBlank
     private String name;
 
 
     /** 简介 */
-    //@Column(name = "introduction",nullable = false)
-    //@NotBlank
     private String introduction;
 
 
     /** 手机号码 */
-    //@Column(name = "phone",nullable = false)
-    //@NotBlank
     private String phone;
 
 
     /** 省市区 */
-    //@Column(name = "address",nullable = false)
-    //@NotBlank
     private String address;
 
 
     /** 详细地址 */
-    //@Column(name = "detailed_address",nullable = false)
-    //@NotBlank
     private String detailedAddress;
 
 
     /** 门店logo */
-    //@Column(name = "image",nullable = false)
-    //@NotBlank
     private String image;
 
 
     /** 纬度 */
-    //@Column(name = "latitude",nullable = false)
-    //@NotBlank
     private String latitude;
 
 
     /** 经度 */
-    //@Column(name = "longitude",nullable = false)
-    //@NotBlank
     private String longitude;
 
 
     /** 核销有效日期 */
-    //@Column(name = "valid_time",nullable = false)
-    //@NotBlank
     private String validTime;
 
 
     /** 每日营业开关时间 */
-    //@Column(name = "day_time",nullable = false)
-    //@NotBlank
     private String dayTime;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
     /** 是否显示 */
-    //@Column(name = "is_show",nullable = false)
-   //@NotNull
     private Integer isShow;
 
 
     /** 是否删除 */
-    //@Column(name = "is_del",nullable = false)
-   //@NotNull
     private Integer isDel;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java
index ff34459e..46cb4174 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -25,65 +23,47 @@ import java.io.Serializable;
 public class YxSystemStoreStaff implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 微信用户id */
-    //@Column(name = "uid",nullable = false)
-   //@NotNull
     private Integer uid;
 
 
     /** 店员头像 */
-    //@Column(name = "avatar",nullable = false)
-    //@NotBlank
     private String avatar;
 
 
     /** 门店id */
-    //@Column(name = "store_id",nullable = false)
-   //@NotNull
     private Integer storeId;
 
 
     /** 店员名称 */
-    //@Column(name = "staff_name",nullable = false)
-    //@NotBlank
     private String staffName;
 
 
     /** 手机号码 */
-    //@Column(name = "phone",nullable = false)
-    //@NotBlank
     private String phone;
 
 
     /** 核销开关 */
-    //@Column(name = "verify_status",nullable = false)
-   //@NotNull
     private Integer verifyStatus;
 
 
     /** 状态 */
-    //@Column(name = "status")
     private Integer status;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time")
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
     /** 微信昵称 */
-    //@Column(name = "nickname",nullable = false)
-    //@NotBlank
     private String nickname;
 
 
     /** 所属门店 */
-    //@Column(name = "store_name")
     private String storeName;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java
index 55c6af0e..e3dacea1 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
 
@@ -26,91 +24,63 @@ import java.io.Serializable;
 public class YxSystemUserLevel implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 商户id */
-    //@Column(name = "mer_id",nullable = false)
-   //@NotNull
     private Integer merId;
 
 
     /** 会员名称 */
-    //@Column(name = "name",nullable = false)
-    //@NotBlank
     private String name;
 
 
     /** 购买金额 */
-    //@Column(name = "money",nullable = false)
-   //@NotNull
     private BigDecimal money;
 
 
     /** 有效时间 */
-    //@Column(name = "valid_date",nullable = false)
-   //@NotNull
     private Integer validDate;
 
 
     /** 是否为永久会员 */
-    //@Column(name = "is_forever",nullable = false)
-   //@NotNull
     private Integer isForever;
 
 
     /** 是否购买,1=购买,0=不购买 */
-    //@Column(name = "is_pay",nullable = false)
-   //@NotNull
     private Integer isPay;
 
 
     /** 是否显示 1=显示,0=隐藏 */
-    //@Column(name = "is_show",nullable = false)
-   //@NotNull
     private Integer isShow;
 
 
     /** 会员等级 */
-    //@Column(name = "grade",nullable = false)
-   //@NotNull
     private Integer grade;
 
 
     /** 享受折扣 */
-    //@Column(name = "discount",nullable = false)
-   //@NotNull
     private BigDecimal discount;
 
     /** 会员卡背景 */
-    //@Column(name = "image",nullable = false)
-    //@NotBlank
     private String image;
 
 
     /** 会员图标 */
-    //@Column(name = "icon",nullable = false)
-    //@NotBlank
     private String icon;
 
 
     /** 说明 */
-     @TableField(value = "`explain`")
-    //@NotBlank
+    @TableField(value = "`explain`")
     private String explain;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
     /** 是否删除.1=删除,0=未删除 */
-    //@Column(name = "is_del",nullable = false)
-   //@NotNull
     private Integer isDel;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java
index 264d8394..056fee06 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -25,68 +23,47 @@ import java.io.Serializable;
 public class YxSystemUserTask implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 任务名称 */
-    //@Column(name = "name",nullable = false)
-    //@NotBlank
     private String name;
 
 
     /** 配置原名 */
-    //@Column(name = "real_name",nullable = false)
-    //@NotBlank
     private String realName;
 
 
     /** 任务类型 */
-    //@Column(name = "task_type",nullable = false)
-    //@NotBlank
     private String taskType;
 
 
     /** 限定数 */
-    //@Column(name = "number",nullable = false)
-   //@NotNull
     private Integer number;
 
 
     /** 等级id */
-    //@Column(name = "level_id",nullable = false)
-   //@NotNull
     private Integer levelId;
 
 
     /** 排序 */
-    //@Column(name = "sort",nullable = false)
-   //@NotNull
     private Integer sort;
 
 
     /** 是否显示 */
-    //@Column(name = "is_show",nullable = false)
-   //@NotNull
     private Integer isShow;
 
 
     /** 是否务必达成任务,1务必达成,0=满足其一 */
-    //@Column(name = "is_must",nullable = false)
-   //@NotNull
     private Integer isMust;
 
 
     /** 任务说明 */
-    //@Column(name = "illustrate",nullable = false)
-    //@NotBlank
     private String illustrate;
 
 
     /** 新增时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java
index 54609abb..d3437bbe 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
 
@@ -29,183 +27,135 @@ public class YxUser implements Serializable {
 
 
     /** 用户账户(跟accout一样) */
-    //@Column(name = "username")
     private String username;
 
 
     /** 用户账号 */
-    //@Column(name = "account",nullable = false)
-    //@NotBlank
     private String account;
 
 
     /** 用户密码（跟pwd） */
-    //@Column(name = "password")
     private String password;
 
 
     /** 用户密码 */
-    //@Column(name = "pwd",nullable = false)
-    //@NotBlank
     private String pwd;
 
 
     /** 真实姓名 */
-    //@Column(name = "real_name")
     private String realName;
 
 
     /** 生日 */
-    //@Column(name = "birthday")
     private Integer birthday;
 
 
     /** 身份证号码 */
-    //@Column(name = "card_id")
     private String cardId;
 
 
     /** 用户备注 */
-    //@Column(name = "mark")
     private String mark;
 
 
     /** 合伙人id */
-    //@Column(name = "partner_id")
     private Integer partnerId;
 
 
     /** 用户分组id */
-    //@Column(name = "group_id")
     private Integer groupId;
 
 
     /** 用户昵称 */
-    //@Column(name = "nickname")
     private String nickname;
 
 
     /** 用户头像 */
-    //@Column(name = "avatar")
     private String avatar;
 
 
     /** 手机号码 */
-    //@Column(name = "phone")
     private String phone;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
     /** 添加ip */
-    //@Column(name = "add_ip")
     private String addIp;
 
 
     /** 最后一次登录时间 */
-    //@Column(name = "last_time",nullable = false)
-   //@NotNull
     private Integer lastTime;
 
 
     /** 最后一次登录ip */
-    //@Column(name = "last_ip")
     private String lastIp;
 
 
     /** 用户余额 */
-    //@Column(name = "now_money",nullable = false)
-   //@NotNull
     private BigDecimal nowMoney;
 
 
     /** 佣金金额 */
-    //@Column(name = "brokerage_price",nullable = false)
-   //@NotNull
     private BigDecimal brokeragePrice;
 
 
     /** 用户剩余积分 */
-    //@Column(name = "integral",nullable = false)
-   //@NotNull
     private BigDecimal integral;
 
 
     /** 连续签到天数 */
-    //@Column(name = "sign_num",nullable = false)
-   //@NotNull
     private Integer signNum;
 
 
     /** 1为正常，0为禁止 */
-    //@Column(name = "status",nullable = false)
-   //@NotNull
     private Integer status;
 
 
     /** 等级 */
-    //@Column(name = "level",nullable = false)
-   //@NotNull
     private Integer level;
 
 
     /** 推广元id */
-    //@Column(name = "spread_uid",nullable = false)
-   //@NotNull
     private Integer spreadUid;
 
 
     /** 推广员关联时间 */
-    //@Column(name = "spread_time",nullable = false)
-   //@NotNull
     private Integer spreadTime;
 
 
     /** 用户类型 */
-    //@Column(name = "user_type",nullable = false)
-    //@NotBlank
     private String userType;
 
 
     /** 是否为推广员 */
-    //@Column(name = "is_promoter",nullable = false)
-   //@NotNull
     private Integer isPromoter;
 
 
     /** 用户购买次数 */
-    //@Column(name = "pay_count")
     private Integer payCount;
 
 
     /** 下级人数 */
-    //@Column(name = "spread_count")
     private Integer spreadCount;
 
 
     /** 清理会员时间 */
-    //@Column(name = "clean_time")
     private Integer cleanTime;
 
 
     /** 详细地址 */
-    //@Column(name = "addres",nullable = false)
-    //@NotBlank
     private String addres;
 
 
     /** 管理员编号  */
-    //@Column(name = "adminid")
     private Integer adminid;
 
 
     /** 用户登陆类型，h5,wechat,routine */
-    //@Column(name = "login_type",nullable = false)
-    //@NotBlank
     private String loginType;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java
index a5064064..31ba40bf 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
 
@@ -27,74 +25,51 @@ public class YxUserBill implements Serializable {
 
     /** 用户账单id */
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 用户uid */
-    //@Column(name = "uid",nullable = false)
-   //@NotNull
     private Integer uid;
 
 
     /** 关联id */
-    //@Column(name = "link_id",nullable = false)
-    //@NotBlank
     private String linkId;
 
 
     /** 0 = 支出 1 = 获得 */
-    //@Column(name = "pm",nullable = false)
-   //@NotNull
     private Integer pm;
 
 
     /** 账单标题 */
-    //@Column(name = "title",nullable = false)
-    //@NotBlank
     private String title;
 
 
     /** 明细种类 */
-    //@Column(name = "category",nullable = false)
-    //@NotBlank
     private String category;
 
 
     /** 明细类型 */
-    //@Column(name = "type",nullable = false)
-    //@NotBlank
     private String type;
 
 
     /** 明细数字 */
-    //@Column(name = "number",nullable = false)
-   //@NotNull
     private BigDecimal number;
 
 
     /** 剩余 */
-    //@Column(name = "balance",nullable = false)
-   //@NotNull
     private BigDecimal balance;
 
 
     /** 备注 */
-    //@Column(name = "mark",nullable = false)
-    //@NotBlank
     private String mark;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time",nullable = false)
-   //@NotNull
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
     /** 0 = 带确定 1 = 有效 -1 = 无效 */
-    //@Column(name = "status",nullable = false)
-   //@NotNull
     private Integer status;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java
index 6bd87b39..23f49554 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.persistence.*;
-import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
 
@@ -26,53 +24,43 @@ import java.io.Serializable;
 public class YxUserRecharge implements Serializable {
 
     @TableId
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
-    //@Column(name = "id")
     private Integer id;
 
 
     /** 充值用户UID */
-    //@Column(name = "uid")
     private Integer uid;
 
 
     /** 订单号 */
-    //@Column(name = "order_id",unique = true)
     private String orderId;
 
 
     /** 充值金额 */
-    //@Column(name = "price")
     private BigDecimal price;
 
 
     /** 充值类型 */
-    //@Column(name = "recharge_type")
     private String rechargeType;
 
 
     /** 是否充值 */
-    //@Column(name = "paid")
     private Integer paid;
 
 
     /** 充值支付时间 */
-    //@Column(name = "pay_time")
     private Integer payTime;
 
 
     /** 充值时间 */
-    //@Column(name = "add_time")
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
     /** 退款金额 */
-    //@Column(name = "refund_price")
     private BigDecimal refundPrice;
 
 
     /** 昵称 */
-    //@Column(name = "nickname")
     private String nickname;
 
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java
index e5d7c051..f486407c 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java
@@ -7,6 +7,8 @@
  * 一经发现盗用、分享等行为，将追究法律责任，后果自负
  */
 package co.yixiang.modules.shop.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
@@ -27,124 +29,95 @@ public class YxWechatUser implements Serializable {
 
 
     /** 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段 */
-    //@Column(name = "unionid")
     private String unionid;
 
 
     /** 用户的标识，对当前公众号唯一 */
-    //@Column(name = "openid",unique = true)
     private String openid;
 
 
     /** 小程序唯一身份ID */
-    //@Column(name = "routine_openid")
     private String routineOpenid;
 
 
     /** 用户的昵称 */
-    //@Column(name = "nickname",nullable = false)
-    //@NotBlank
     private String nickname;
 
 
     /** 用户头像 */
-    //@Column(name = "headimgurl",nullable = false)
-    //@NotBlank
     private String headimgurl;
 
 
     /** 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 */
-    //@Column(name = "sex",nullable = false)
-   //@NotNull
     private Integer sex;
 
 
     /** 用户所在城市 */
-    //@Column(name = "city",nullable = false)
-    //@NotBlank
     private String city;
 
 
     /** 用户的语言，简体中文为zh_CN */
-    //@Column(name = "language",nullable = false)
-    //@NotBlank
     private String language;
 
 
     /** 用户所在省份 */
-    //@Column(name = "province",nullable = false)
-    //@NotBlank
     private String province;
 
 
     /** 用户所在国家 */
-    //@Column(name = "country",nullable = false)
-    //@NotBlank
     private String country;
 
 
     /** 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 */
-    //@Column(name = "remark")
     private String remark;
 
 
     /** 用户所在的分组ID（兼容旧的用户分组接口） */
-    //@Column(name = "groupid")
     private Integer groupid;
 
 
     /** 用户被打上的标签ID列表 */
-    //@Column(name = "tagid_list")
     private String tagidList;
 
 
     /** 用户是否订阅该公众号标识 */
-    //@Column(name = "subscribe")
     private Integer subscribe;
 
 
     /** 关注公众号时间 */
-    //@Column(name = "subscribe_time")
     private Integer subscribeTime;
 
 
     /** 添加时间 */
-    //@Column(name = "add_time")
+    @TableField(fill= FieldFill.INSERT)
     private Integer addTime;
 
 
     /** 一级推荐人 */
-    //@Column(name = "stair")
     private Integer stair;
 
 
     /** 二级推荐人 */
-    //@Column(name = "second")
     private Integer second;
 
 
     /** 一级推荐人订单 */
-    //@Column(name = "order_stair")
     private Integer orderStair;
 
 
     /** 二级推荐人订单 */
-    //@Column(name = "order_second")
     private Integer orderSecond;
 
 
     /** 佣金 */
-    //@Column(name = "now_money")
     private BigDecimal nowMoney;
 
 
     /** 小程序用户会话密匙 */
-    //@Column(name = "session_key")
     private String sessionKey;
 
 
     /** 用户类型 */
-    //@Column(name = "user_type")
     private String userType;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java b/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java
index a5a6b0aa..467d8aa5 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/monitor/domain/Visits.java
@@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import org.hibernate.annotations.CreationTimestamp;
-
-import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java
index 701f7290..710754f4 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java
@@ -7,6 +7,8 @@
  * 一经发现盗用、分享等行为，将追究法律责任，后果自负
  */
 package co.yixiang.modules.quartz.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -32,43 +34,35 @@ public class QuartzJob implements Serializable {
 
 
     /** Spring Bean名称 */
-    //@Column(name = "bean_name")
     private String beanName;
 
 
     /** cron 表达式 */
-    //@Column(name = "cron_expression")
     private String cronExpression;
 
 
     /** 状态：1暂停、0启用 */
-    //@Column(name = "is_pause")
     private Boolean isPause;
 
 
     /** 任务名称 */
-    //@Column(name = "job_name")
     private String jobName;
 
 
     /** 方法名称 */
-    //@Column(name = "method_name")
     private String methodName;
 
 
     /** 参数 */
-    //@Column(name = "params")
     private String params;
 
 
     /** 备注 */
-    //@Column(name = "remark")
     private String remark;
 
 
     /** 创建日期 */
-    //@Column(name = "create_time")
-    //@TableField(fill= FieldFill.INSERT)
+    @TableField(fill= FieldFill.INSERT)
     private Timestamp createTime;
 
     public void copy(QuartzJob source){
diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java
index 43ac38d5..5617570c 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java
@@ -7,6 +7,8 @@
  * 一经发现盗用、分享等行为，将追究法律责任，后果自负
  */
 package co.yixiang.modules.quartz.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -31,48 +33,39 @@ public class QuartzLog implements Serializable {
 
 
     /** 任务名称 */
-    //@Column(name = "baen_name")
     private String baenName;
 
 
-    /** Bean名称  */
-    @Column(name = "create_time")
-    //@TableField(fill= FieldFill.INSERT)
+    /** 创建时间  */
+    @TableField(fill= FieldFill.INSERT)
     private Timestamp createTime;
 
 
     /** cron表达式 */
-    //@Column(name = "cron_expression")
     private String cronExpression;
 
 
     /** 异常详细  */
-    //@Column(name = "exception_detail")
     private String exceptionDetail;
 
 
     /** 状态 */
-    //@Column(name = "is_success")
     private Boolean isSuccess;
 
 
     /** 任务名称 */
-    //@Column(name = "job_name")
     private String jobName;
 
 
     /** 方法名称 */
-    //@Column(name = "method_name")
     private String methodName;
 
 
     /** 参数 */
-    //@Column(name = "params")
     private String params;
 
 
     /** 耗时（毫秒） */
-    //@Column(name = "time")
     private Long time;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java
index 7165153c..a844ad8e 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java
@@ -8,14 +8,12 @@
 */
 package co.yixiang.modules.system.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
@@ -37,12 +35,10 @@ public class Dept implements Serializable {
 
 
     /** 上级部门 */
-    @NotNull
     private Long pid;
 
 
     /** 状态 */
-    @NotNull
     private Boolean enabled;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java
index 12102277..f6b4a23c 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dict.java
@@ -8,14 +8,12 @@
 */
 package co.yixiang.modules.system.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
@@ -33,7 +31,6 @@ public class Dict implements Serializable {
 
 
     /** 字典名称 */
-    //@NotBlank
     private String name;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java
index 3665979a..0b1af75f 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/DictDetail.java
@@ -8,14 +8,12 @@
 */
 package co.yixiang.modules.system.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
@@ -33,12 +31,10 @@ public class DictDetail implements Serializable {
 
 
     /** 字典标签 */
-    //@NotBlank
     private String label;
 
 
     /** 字典值 */
-    //@NotBlank
     private String value;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java
index adf6ef48..edc20c62 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Job.java
@@ -8,14 +8,12 @@
 */
 package co.yixiang.modules.system.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
@@ -32,19 +30,16 @@ public class Job implements Serializable {
     private Long id;
 
     /** 岗位名称 */
-    //@NotBlank
     private String name;
 
 
     /** 岗位状态 */
-    //@NotNull
     private Boolean enabled;
 
     @TableField(exist = false)
     private Dept dept;
 
     /** 岗位排序 */
-    //@NotNull
     private Long sort;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java
index fbb993a7..784f9953 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Menu.java
@@ -8,7 +8,6 @@
 */
 package co.yixiang.modules.system.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java
index 96c3eaf0..1d63e760 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Role.java
@@ -8,7 +8,6 @@
 */
 package co.yixiang.modules.system.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -34,7 +33,6 @@ public class Role implements Serializable {
 
 
     /** 名称 */
-    //@NotBlank
     private String name;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java
index 493701b6..8badd58f 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java
@@ -23,11 +23,9 @@ import java.io.Serializable;
 @TableName("roles_depts")
 public class RolesDepts implements Serializable {
 
-    @TableId
     private Long roleId;
 
 
-    @TableId
     private Long deptId;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java
index b81ca960..2afce733 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java
@@ -7,7 +7,6 @@
 * 一经发现盗用、分享等行为，将追究法律责任，后果自负
 */
 package co.yixiang.modules.system.domain;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
 import cn.hutool.core.bean.BeanUtil;
@@ -23,12 +22,10 @@ import java.io.Serializable;
 public class RolesMenus implements Serializable {
 
     /** 菜单ID */
-    @TableId
     private Long menuId;
 
 
     /** 角色ID */
-    @TableId
     private Long roleId;
 
     public void copy(RolesMenus source){
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java
index 59a3c88e..08d09957 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/User.java
@@ -51,10 +51,15 @@ public class User implements Serializable {
     @TableField(exist = false)
     private UserAvatar userAvatar;
 
+    /** 用户角色 */
     @TableField(exist = false)
     private Set<Role> roles;
+
+    /** 用户职位*/
     @TableField(exist = false)
     private Job job;
+
+    /** 用户部门*/
     @TableField(exist = false)
     private Dept dept;
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java
index d09952c4..7b249364 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java
@@ -9,14 +9,12 @@
 package co.yixiang.modules.system.domain;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java
index 41b9f867..1924cc95 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java
@@ -7,7 +7,6 @@
 * 一经发现盗用、分享等行为，将追究法律责任，后果自负
 */
 package co.yixiang.modules.system.domain;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;