mbg生成model时自动生成swagger注解

mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java

@@ -2,7 +2,9 @@ package com.macro.mall;
 
 import org.mybatis.generator.api.IntrospectedColumn;
 import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.dom.java.CompilationUnit;
 import org.mybatis.generator.api.dom.java.Field;
+import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
 import org.mybatis.generator.internal.DefaultCommentGenerator;
 import org.mybatis.generator.internal.util.StringUtility;
 
@@ -14,6 +16,8 @@ import java.util.Properties;
  */
 public class CommentGenerator extends DefaultCommentGenerator {
     private boolean addRemarkComments = false;
+    private static final String EXAMPLE_SUFFIX="Example";
+    private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.annotations.ApiModelProperty";
 
     /**
      * 设置用户配置的参数
@@ -33,15 +37,37 @@ public class CommentGenerator extends DefaultCommentGenerator {
         String remarks = introspectedColumn.getRemarks();
         //根据参数和备注信息判断是否添加备注信息
         if(addRemarkComments&&StringUtility.stringHasValue(remarks)){
-            //文档注释开始
+//            addFieldJavaDoc(field, remarks);
-            field.addJavaDocLine("/**");
+            //数据库中特殊字符需要转义
-            //获取数据库字段的备注信息
+            if(remarks.contains("\"")){
-            String[] remarkLines = remarks.split(System.getProperty("line.separator"));
+                remarks = remarks.replace("\"","'");
-            for(String remarkLine:remarkLines){
-                field.addJavaDocLine(" * "+remarkLine);
             }
-            addJavadocTag(field, false);
+            //给model的字段添加swagger注解
-            field.addJavaDocLine(" */");
+            field.addJavaDocLine("@ApiModelProperty(value = \""+remarks+"\")");
+        }
+    }
+
+    /**
+     * 给model的字段添加注释
+     */
+    private void addFieldJavaDoc(Field field, String remarks) {
+        //文档注释开始
+        field.addJavaDocLine("/**");
+        //获取数据库字段的备注信息
+        String[] remarkLines = remarks.split(System.getProperty("line.separator"));
+        for(String remarkLine:remarkLines){
+            field.addJavaDocLine(" * "+remarkLine);
+        }
+        addJavadocTag(field, false);
+        field.addJavaDocLine(" */");
+    }
+
+    @Override
+    public void addJavaFileComment(CompilationUnit compilationUnit) {
+        super.addJavaFileComment(compilationUnit);
+        //只在model中添加swagger注解类的导入
+        if(!compilationUnit.isJavaInterface()&&!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
+            compilationUnit.addImportedType(new FullyQualifiedJavaType(API_MODEL_PROPERTY_FULL_CLASS_NAME));
         }
     }
 }

mall-mbg/src/main/java/com/macro/mall/model/CmsHelp.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 

mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategory.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class CmsHelpCategory implements Serializable {
@@ -7,18 +8,10 @@ public class CmsHelpCategory implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "分类图标")
-     * 分类图标
-     *
-     * @mbggenerated
-     */
     private String icon;
 
-    /**
+    @ApiModelProperty(value = "专题数量")
-     * 专题数量
-     *
-     * @mbggenerated
-     */
     private Integer helpCount;
 
     private Integer showStatus;

mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReport.java

@@ -1,41 +1,26 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
 public class CmsMemberReport implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "举报类型：0->商品评价；1->话题内容；2->用户评论")
-     * 举报类型：0->商品评价；1->话题内容；2->用户评论
-     *
-     * @mbggenerated
-     */
     private Integer reportType;
 
-    /**
+    @ApiModelProperty(value = "举报人")
-     * 举报人
-     *
-     * @mbggenerated
-     */
     private String reportMemberName;
 
     private Date createTime;
 
     private String reportObject;
 
-    /**
+    @ApiModelProperty(value = "举报状态：0->未处理；1->已处理")
-     * 举报状态：0->未处理；1->已处理
-     *
-     * @mbggenerated
-     */
     private Integer reportStatus;
 
-    /**
+    @ApiModelProperty(value = "处理结果：0->无效；1->有效；2->恶意")
-     * 处理结果：0->无效；1->有效；2->恶意
-     *
-     * @mbggenerated
-     */
     private Integer handleStatus;
 
     private String note;

mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceArea.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class CmsPrefrenceArea implements Serializable {
@@ -13,11 +14,7 @@ public class CmsPrefrenceArea implements Serializable {
 
     private Integer showStatus;
 
-    /**
+    @ApiModelProperty(value = "展示图片")
-     * 展示图片
-     *
-     * @mbggenerated
-     */
     private byte[] pic;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaProductRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class CmsPrefrenceAreaProductRelation implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/CmsSubject.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,18 +11,10 @@ public class CmsSubject implements Serializable {
 
     private String title;
 
-    /**
+    @ApiModelProperty(value = "专题主图")
-     * 专题主图
-     *
-     * @mbggenerated
-     */
     private String pic;
 
-    /**
+    @ApiModelProperty(value = "关联产品数量")
-     * 关联产品数量
-     *
-     * @mbggenerated
-     */
     private Integer productCount;
 
     private Integer recommendStatus;
@@ -34,34 +27,18 @@ public class CmsSubject implements Serializable {
 
     private Integer commentCount;
 
-    /**
+    @ApiModelProperty(value = "画册图片用逗号分割")
-     * 画册图片用逗号分割
-     *
-     * @mbggenerated
-     */
     private String albumPics;
 
     private String description;
 
-    /**
+    @ApiModelProperty(value = "显示状态：0->不显示；1->显示")
-     * 显示状态：0->不显示；1->显示
-     *
-     * @mbggenerated
-     */
     private Integer showStatus;
 
-    /**
+    @ApiModelProperty(value = "转发数")
-     * 转发数
-     *
-     * @mbggenerated
-     */
     private Integer forwardCount;
 
-    /**
+    @ApiModelProperty(value = "专题分类名称")
-     * 专题分类名称
-     *
-     * @mbggenerated
-     */
     private String categoryName;
 
     private String content;

mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategory.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class CmsSubjectCategory implements Serializable {
@@ -7,18 +8,10 @@ public class CmsSubjectCategory implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "分类图标")
-     * 分类图标
-     *
-     * @mbggenerated
-     */
     private String icon;
 
-    /**
+    @ApiModelProperty(value = "专题数量")
-     * 专题数量
-     *
-     * @mbggenerated
-     */
     private Integer subjectCount;
 
     private Integer showStatus;

mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectComment.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 

mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectProductRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class CmsSubjectProductRelation implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/CmsTopic.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -16,41 +17,21 @@ public class CmsTopic implements Serializable {
 
     private Date endTime;
 
-    /**
+    @ApiModelProperty(value = "参与人数")
-     * 参与人数
-     *
-     * @mbggenerated
-     */
     private Integer attendCount;
 
-    /**
+    @ApiModelProperty(value = "关注人数")
-     * 关注人数
-     *
-     * @mbggenerated
-     */
     private Integer attentionCount;
 
     private Integer readCount;
 
-    /**
+    @ApiModelProperty(value = "奖品名称")
-     * 奖品名称
-     *
-     * @mbggenerated
-     */
     private String awardName;
 
-    /**
+    @ApiModelProperty(value = "参与方式")
-     * 参与方式
-     *
-     * @mbggenerated
-     */
     private String attendType;
 
-    /**
+    @ApiModelProperty(value = "话题内容")
-     * 话题内容
-     *
-     * @mbggenerated
-     */
     private String content;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategory.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class CmsTopicCategory implements Serializable {
@@ -7,18 +8,10 @@ public class CmsTopicCategory implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "分类图标")
-     * 分类图标
-     *
-     * @mbggenerated
-     */
     private String icon;
 
-    /**
+    @ApiModelProperty(value = "专题数量")
-     * 专题数量
-     *
-     * @mbggenerated
-     */
     private Integer subjectCount;
 
     private Integer showStatus;

mall-mbg/src/main/java/com/macro/mall/model/CmsTopicComment.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 

mall-mbg/src/main/java/com/macro/mall/model/OmsCartItem.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -13,113 +14,53 @@ public class OmsCartItem implements Serializable {
 
     private Long memberId;
 
-    /**
+    @ApiModelProperty(value = "购买数量")
-     * 购买数量
-     *
-     * @mbggenerated
-     */
     private Integer quantity;
 
-    /**
+    @ApiModelProperty(value = "添加到购物车的价格")
-     * 添加到购物车的价格
-     *
-     * @mbggenerated
-     */
     private BigDecimal price;
 
-    /**
+    @ApiModelProperty(value = "销售属性1")
-     * 销售属性1
-     *
-     * @mbggenerated
-     */
     private String sp1;
 
-    /**
+    @ApiModelProperty(value = "销售属性2")
-     * 销售属性2
-     *
-     * @mbggenerated
-     */
     private String sp2;
 
-    /**
+    @ApiModelProperty(value = "销售属性3")
-     * 销售属性3
-     *
-     * @mbggenerated
-     */
     private String sp3;
 
-    /**
+    @ApiModelProperty(value = "商品主图")
-     * 商品主图
-     *
-     * @mbggenerated
-     */
     private String productPic;
 
-    /**
+    @ApiModelProperty(value = "商品名称")
-     * 商品名称
-     *
-     * @mbggenerated
-     */
     private String productName;
 
-    /**
+    @ApiModelProperty(value = "商品副标题（卖点）")
-     * 商品副标题（卖点）
-     *
-     * @mbggenerated
-     */
     private String productSubTitle;
 
-    /**
+    @ApiModelProperty(value = "商品sku条码")
-     * 商品sku条码
-     *
-     * @mbggenerated
-     */
     private String productSkuCode;
 
-    /**
+    @ApiModelProperty(value = "会员昵称")
-     * 会员昵称
-     *
-     * @mbggenerated
-     */
     private String memberNickname;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
-     *
-     * @mbggenerated
-     */
     private Date createDate;
 
-    /**
+    @ApiModelProperty(value = "修改时间")
-     * 修改时间
-     *
-     * @mbggenerated
-     */
     private Date modifyDate;
 
-    /**
+    @ApiModelProperty(value = "是否删除")
-     * 是否删除
-     *
-     * @mbggenerated
-     */
     private Integer deleteStatus;
 
-    /**
+    @ApiModelProperty(value = "商品分类")
-     * 商品分类
-     *
-     * @mbggenerated
-     */
     private Long productCategoryId;
 
     private String productBrand;
 
     private String productSn;
 
-    /**
+    @ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
-     * 商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]
-     *
-     * @mbggenerated
-     */
     private String productAttr;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java

@@ -1,71 +1,36 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class OmsCompanyAddress implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "地址名称")
-     * 地址名称
-     *
-     * @mbggenerated
-     */
     private String addressName;
 
-    /**
+    @ApiModelProperty(value = "默认发货地址：0->否；1->是")
-     * 默认发货地址：0->否；1->是
-     *
-     * @mbggenerated
-     */
     private Integer sendStatus;
 
-    /**
+    @ApiModelProperty(value = "是否默认收货地址：0->否；1->是")
-     * 是否默认收货地址：0->否；1->是
-     *
-     * @mbggenerated
-     */
     private Integer receiveStatus;
 
-    /**
+    @ApiModelProperty(value = "收发货人姓名")
-     * 收发货人姓名
-     *
-     * @mbggenerated
-     */
     private String name;
 
-    /**
+    @ApiModelProperty(value = "收货人电话")
-     * 收货人电话
-     *
-     * @mbggenerated
-     */
     private String phone;
 
-    /**
+    @ApiModelProperty(value = "省/直辖市")
-     * 省/直辖市
-     *
-     * @mbggenerated
-     */
     private String province;
 
-    /**
+    @ApiModelProperty(value = "市")
-     * 市
-     *
-     * @mbggenerated
-     */
     private String city;
 
-    /**
+    @ApiModelProperty(value = "区")
-     * 区
-     *
-     * @mbggenerated
-     */
     private String region;
 
-    /**
+    @ApiModelProperty(value = "详细地址")
-     * 详细地址
-     *
-     * @mbggenerated
-     */
     private String detailAddress;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java

@@ -1,306 +1,139 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 public class OmsOrder implements Serializable {
-    /**
+    @ApiModelProperty(value = "订单id")
-     * 订单id
-     *
-     * @mbggenerated
-     */
     private Long id;
 
     private Long memberId;
 
     private Long couponId;
 
-    /**
+    @ApiModelProperty(value = "订单编号")
-     * 订单编号
-     *
-     * @mbggenerated
-     */
     private String orderSn;
 
-    /**
+    @ApiModelProperty(value = "提交时间")
-     * 提交时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "用户帐号")
-     * 用户帐号
-     *
-     * @mbggenerated
-     */
     private String memberUsername;
 
-    /**
+    @ApiModelProperty(value = "订单总金额")
-     * 订单总金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal totalAmount;
 
-    /**
+    @ApiModelProperty(value = "应付金额（实际支付金额）")
-     * 应付金额（实际支付金额）
-     *
-     * @mbggenerated
-     */
     private BigDecimal payAmount;
 
-    /**
+    @ApiModelProperty(value = "运费金额")
-     * 运费金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal freightAmount;
 
-    /**
+    @ApiModelProperty(value = "促销优化金额（促销价、满减、阶梯价）")
-     * 促销优化金额（促销价、满减、阶梯价）
-     *
-     * @mbggenerated
-     */
     private BigDecimal promotionAmount;
 
-    /**
+    @ApiModelProperty(value = "积分抵扣金额")
-     * 积分抵扣金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal integrationAmount;
 
-    /**
+    @ApiModelProperty(value = "优惠券抵扣金额")
-     * 优惠券抵扣金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal couponAmount;
 
-    /**
+    @ApiModelProperty(value = "管理员后台调整订单使用的折扣金额")
-     * 管理员后台调整订单使用的折扣金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal discountAmount;
 
-    /**
+    @ApiModelProperty(value = "支付方式：0->未支付；1->支付宝；2->微信")
-     * 支付方式：0->未支付；1->支付宝；2->微信
-     *
-     * @mbggenerated
-     */
     private Integer payType;
 
-    /**
+    @ApiModelProperty(value = "订单来源：0->PC订单；1->app订单")
-     * 订单来源：0->PC订单；1->app订单
-     *
-     * @mbggenerated
-     */
     private Integer sourceType;
 
-    /**
+    @ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
-     * 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "订单类型：0->正常订单；1->秒杀订单")
-     * 订单类型：0->正常订单；1->秒杀订单
-     *
-     * @mbggenerated
-     */
     private Integer orderType;
 
-    /**
+    @ApiModelProperty(value = "物流公司(配送方式)")
-     * 物流公司(配送方式)
-     *
-     * @mbggenerated
-     */
     private String deliveryCompany;
 
-    /**
+    @ApiModelProperty(value = "物流单号")
-     * 物流单号
-     *
-     * @mbggenerated
-     */
     private String deliverySn;
 
-    /**
+    @ApiModelProperty(value = "自动确认时间（天）")
-     * 自动确认时间（天）
-     *
-     * @mbggenerated
-     */
     private Integer autoConfirmDay;
 
-    /**
+    @ApiModelProperty(value = "可以获得的积分")
-     * 可以获得的积分
-     *
-     * @mbggenerated
-     */
     private Integer integration;
 
-    /**
+    @ApiModelProperty(value = "可以活动的成长值")
-     * 可以活动的成长值
-     *
-     * @mbggenerated
-     */
     private Integer growth;
 
-    /**
+    @ApiModelProperty(value = "活动信息")
-     * 活动信息
-     *
-     * @mbggenerated
-     */
     private String promotionInfo;
 
-    /**
+    @ApiModelProperty(value = "发票类型：0->不开发票；1->电子发票；2->纸质发票")
-     * 发票类型：0->不开发票；1->电子发票；2->纸质发票
-     *
-     * @mbggenerated
-     */
     private Integer billType;
 
-    /**
+    @ApiModelProperty(value = "发票抬头")
-     * 发票抬头
-     *
-     * @mbggenerated
-     */
     private String billHeader;
 
-    /**
+    @ApiModelProperty(value = "发票内容")
-     * 发票内容
-     *
-     * @mbggenerated
-     */
     private String billContent;
 
-    /**
+    @ApiModelProperty(value = "收票人电话")
-     * 收票人电话
-     *
-     * @mbggenerated
-     */
     private String billReceiverPhone;
 
-    /**
+    @ApiModelProperty(value = "收票人邮箱")
-     * 收票人邮箱
-     *
-     * @mbggenerated
-     */
     private String billReceiverEmail;
 
-    /**
+    @ApiModelProperty(value = "收货人姓名")
-     * 收货人姓名
-     *
-     * @mbggenerated
-     */
     private String receiverName;
 
-    /**
+    @ApiModelProperty(value = "收货人电话")
-     * 收货人电话
-     *
-     * @mbggenerated
-     */
     private String receiverPhone;
 
-    /**
+    @ApiModelProperty(value = "收货人邮编")
-     * 收货人邮编
-     *
-     * @mbggenerated
-     */
     private String receiverPostCode;
 
-    /**
+    @ApiModelProperty(value = "省份/直辖市")
-     * 省份/直辖市
-     *
-     * @mbggenerated
-     */
     private String receiverProvince;
 
-    /**
+    @ApiModelProperty(value = "城市")
-     * 城市
-     *
-     * @mbggenerated
-     */
     private String receiverCity;
 
-    /**
+    @ApiModelProperty(value = "区")
-     * 区
-     *
-     * @mbggenerated
-     */
     private String receiverRegion;
 
-    /**
+    @ApiModelProperty(value = "详细地址")
-     * 详细地址
-     *
-     * @mbggenerated
-     */
     private String receiverDetailAddress;
 
-    /**
+    @ApiModelProperty(value = "订单备注")
-     * 订单备注
-     *
-     * @mbggenerated
-     */
     private String note;
 
-    /**
+    @ApiModelProperty(value = "确认收货状态：0->未确认；1->已确认")
-     * 确认收货状态：0->未确认；1->已确认
-     *
-     * @mbggenerated
-     */
     private Integer confirmStatus;
 
-    /**
+    @ApiModelProperty(value = "删除状态：0->未删除；1->已删除")
-     * 删除状态：0->未删除；1->已删除
-     *
-     * @mbggenerated
-     */
     private Integer deleteStatus;
 
-    /**
+    @ApiModelProperty(value = "下单时使用的积分")
-     * 下单时使用的积分
-     *
-     * @mbggenerated
-     */
     private Integer useIntegration;
 
-    /**
+    @ApiModelProperty(value = "支付时间")
-     * 支付时间
-     *
-     * @mbggenerated
-     */
     private Date paymentTime;
 
-    /**
+    @ApiModelProperty(value = "发货时间")
-     * 发货时间
-     *
-     * @mbggenerated
-     */
     private Date deliveryTime;
 
-    /**
+    @ApiModelProperty(value = "确认收货时间")
-     * 确认收货时间
-     *
-     * @mbggenerated
-     */
     private Date receiveTime;
 
-    /**
+    @ApiModelProperty(value = "评价时间")
-     * 评价时间
-     *
-     * @mbggenerated
-     */
     private Date commentTime;
 
-    /**
+    @ApiModelProperty(value = "修改时间")
-     * 修改时间
-     *
-     * @mbggenerated
-     */
     private Date modifyTime;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java

@@ -1,23 +1,16 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 public class OmsOrderItem implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "订单id")
-     * 订单id
-     *
-     * @mbggenerated
-     */
     private Long orderId;
 
-    /**
+    @ApiModelProperty(value = "订单编号")
-     * 订单编号
-     *
-     * @mbggenerated
-     */
     private String orderSn;
 
     private Long productId;
@@ -30,96 +23,48 @@ public class OmsOrderItem implements Serializable {
 
     private String productSn;
 
-    /**
+    @ApiModelProperty(value = "销售价格")
-     * 销售价格
-     *
-     * @mbggenerated
-     */
     private BigDecimal productPrice;
 
-    /**
+    @ApiModelProperty(value = "购买数量")
-     * 购买数量
-     *
-     * @mbggenerated
-     */
     private Integer productQuantity;
 
-    /**
+    @ApiModelProperty(value = "商品sku编号")
-     * 商品sku编号
-     *
-     * @mbggenerated
-     */
     private Long productSkuId;
 
-    /**
+    @ApiModelProperty(value = "商品sku条码")
-     * 商品sku条码
-     *
-     * @mbggenerated
-     */
     private String productSkuCode;
 
-    /**
+    @ApiModelProperty(value = "商品分类id")
-     * 商品分类id
-     *
-     * @mbggenerated
-     */
     private Long productCategoryId;
 
-    /**
+    @ApiModelProperty(value = "商品的销售属性")
-     * 商品的销售属性
-     *
-     * @mbggenerated
-     */
     private String sp1;
 
     private String sp2;
 
     private String sp3;
 
-    /**
+    @ApiModelProperty(value = "商品促销名称")
-     * 商品促销名称
-     *
-     * @mbggenerated
-     */
     private String promotionName;
 
-    /**
+    @ApiModelProperty(value = "商品促销分解金额")
-     * 商品促销分解金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal promotionAmount;
 
-    /**
+    @ApiModelProperty(value = "优惠券优惠分解金额")
-     * 优惠券优惠分解金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal couponAmount;
 
-    /**
+    @ApiModelProperty(value = "积分优惠分解金额")
-     * 积分优惠分解金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal integrationAmount;
 
-    /**
+    @ApiModelProperty(value = "该商品经过优惠后的分解金额")
-     * 该商品经过优惠后的分解金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal realAmount;
 
     private Integer giftIntegration;
 
     private Integer giftGrowth;
 
-    /**
+    @ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
-     * 商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]
-     *
-     * @mbggenerated
-     */
     private String productAttr;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistory.java

@@ -1,44 +1,25 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
 public class OmsOrderOperateHistory implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "订单id")
-     * 订单id
-     *
-     * @mbggenerated
-     */
     private Long orderId;
 
-    /**
+    @ApiModelProperty(value = "操作人：用户；系统；后台管理员")
-     * 操作人：用户；系统；后台管理员
-     *
-     * @mbggenerated
-     */
     private String operateMan;
 
-    /**
+    @ApiModelProperty(value = "操作时间")
-     * 操作时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
-     * 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
-     *
-     * @mbggenerated
-     */
     private Integer orderStatus;
 
-    /**
+    @ApiModelProperty(value = "备注")
-     * 备注
-     *
-     * @mbggenerated
-     */
     private String note;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -7,186 +8,82 @@ import java.util.Date;
 public class OmsOrderReturnApply implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "订单id")
-     * 订单id
-     *
-     * @mbggenerated
-     */
     private Long orderId;
 
-    /**
+    @ApiModelProperty(value = "收货地址表id")
-     * 收货地址表id
-     *
-     * @mbggenerated
-     */
     private Long companyAddressId;
 
-    /**
+    @ApiModelProperty(value = "退货商品id")
-     * 退货商品id
-     *
-     * @mbggenerated
-     */
     private Long productId;
 
-    /**
+    @ApiModelProperty(value = "订单编号")
-     * 订单编号
-     *
-     * @mbggenerated
-     */
     private String orderSn;
 
-    /**
+    @ApiModelProperty(value = "申请时间")
-     * 申请时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "会员用户名")
-     * 会员用户名
-     *
-     * @mbggenerated
-     */
     private String memberUsername;
 
-    /**
+    @ApiModelProperty(value = "退款金额")
-     * 退款金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal returnAmount;
 
-    /**
+    @ApiModelProperty(value = "退货人姓名")
-     * 退货人姓名
-     *
-     * @mbggenerated
-     */
     private String returnName;
 
-    /**
+    @ApiModelProperty(value = "退货人电话")
-     * 退货人电话
-     *
-     * @mbggenerated
-     */
     private String returnPhone;
 
-    /**
+    @ApiModelProperty(value = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝")
-     * 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "处理时间")
-     * 处理时间
-     *
-     * @mbggenerated
-     */
     private Date handleTime;
 
-    /**
+    @ApiModelProperty(value = "商品图片")
-     * 商品图片
-     *
-     * @mbggenerated
-     */
     private String productPic;
 
-    /**
+    @ApiModelProperty(value = "商品名称")
-     * 商品名称
-     *
-     * @mbggenerated
-     */
     private String productName;
 
-    /**
+    @ApiModelProperty(value = "商品品牌")
-     * 商品品牌
-     *
-     * @mbggenerated
-     */
     private String productBrand;
 
-    /**
+    @ApiModelProperty(value = "商品销售属性：颜色：红色；尺码：xl;")
-     * 商品销售属性：颜色：红色；尺码：xl;
-     *
-     * @mbggenerated
-     */
     private String productAttr;
 
-    /**
+    @ApiModelProperty(value = "退货数量")
-     * 退货数量
-     *
-     * @mbggenerated
-     */
     private Integer productCount;
 
-    /**
+    @ApiModelProperty(value = "商品单价")
-     * 商品单价
-     *
-     * @mbggenerated
-     */
     private BigDecimal productPrice;
 
-    /**
+    @ApiModelProperty(value = "商品实际支付单价")
-     * 商品实际支付单价
-     *
-     * @mbggenerated
-     */
     private BigDecimal productRealPrice;
 
-    /**
+    @ApiModelProperty(value = "原因")
-     * 原因
-     *
-     * @mbggenerated
-     */
     private String reason;
 
-    /**
+    @ApiModelProperty(value = "描述")
-     * 描述
-     *
-     * @mbggenerated
-     */
     private String description;
 
-    /**
+    @ApiModelProperty(value = "凭证图片，以逗号隔开")
-     * 凭证图片，以逗号隔开
-     *
-     * @mbggenerated
-     */
     private String proofPics;
 
-    /**
+    @ApiModelProperty(value = "处理备注")
-     * 处理备注
-     *
-     * @mbggenerated
-     */
     private String handleNote;
 
-    /**
+    @ApiModelProperty(value = "处理人员")
-     * 处理人员
-     *
-     * @mbggenerated
-     */
     private String handleMan;
 
-    /**
+    @ApiModelProperty(value = "收货人")
-     * 收货人
-     *
-     * @mbggenerated
-     */
     private String receiveMan;
 
-    /**
+    @ApiModelProperty(value = "收货时间")
-     * 收货时间
-     *
-     * @mbggenerated
-     */
     private Date receiveTime;
 
-    /**
+    @ApiModelProperty(value = "收货备注")
-     * 收货备注
-     *
-     * @mbggenerated
-     */
     private String receiveNote;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReason.java

@@ -1,32 +1,21 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
 public class OmsOrderReturnReason implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "退货类型")
-     * 退货类型
-     *
-     * @mbggenerated
-     */
     private String name;
 
     private Integer sort;
 
-    /**
+    @ApiModelProperty(value = "状态：0->不启用；1->启用")
-     * 状态：0->不启用；1->启用
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "添加时间")
-     * 添加时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSetting.java

@@ -1,43 +1,24 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class OmsOrderSetting implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "秒杀订单超时关闭时间(分)")
-     * 秒杀订单超时关闭时间(分)
-     *
-     * @mbggenerated
-     */
     private Integer flashOrderOvertime;
 
-    /**
+    @ApiModelProperty(value = "正常订单超时时间(分)")
-     * 正常订单超时时间(分)
-     *
-     * @mbggenerated
-     */
     private Integer normalOrderOvertime;
 
-    /**
+    @ApiModelProperty(value = "发货后自动确认收货时间（天）")
-     * 发货后自动确认收货时间（天）
-     *
-     * @mbggenerated
-     */
     private Integer confirmOvertime;
 
-    /**
+    @ApiModelProperty(value = "自动完成交易时间，不能申请售后（天）")
-     * 自动完成交易时间，不能申请售后（天）
-     *
-     * @mbggenerated
-     */
     private Integer finishOvertime;
 
-    /**
+    @ApiModelProperty(value = "订单完成后自动好评时间（天）")
-     * 订单完成后自动好评时间（天）
-     *
-     * @mbggenerated
-     */
     private Integer commentOvertime;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsAlbum.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsAlbum implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumPic.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsAlbumPic implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/PmsBrand.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsBrand implements Serializable {
@@ -7,57 +8,29 @@ public class PmsBrand implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "首字母")
-     * 首字母
-     *
-     * @mbggenerated
-     */
     private String firstLetter;
 
     private Integer sort;
 
-    /**
+    @ApiModelProperty(value = "是否为品牌制造商：0->不是；1->是")
-     * 是否为品牌制造商：0->不是；1->是
-     *
-     * @mbggenerated
-     */
     private Integer factoryStatus;
 
     private Integer showStatus;
 
-    /**
+    @ApiModelProperty(value = "产品数量")
-     * 产品数量
-     *
-     * @mbggenerated
-     */
     private Integer productCount;
 
-    /**
+    @ApiModelProperty(value = "产品评论数量")
-     * 产品评论数量
-     *
-     * @mbggenerated
-     */
     private Integer productCommentCount;
 
-    /**
+    @ApiModelProperty(value = "品牌logo")
-     * 品牌logo
-     *
-     * @mbggenerated
-     */
     private String logo;
 
-    /**
+    @ApiModelProperty(value = "专区大图")
-     * 专区大图
-     *
-     * @mbggenerated
-     */
     private String bigPic;
 
-    /**
+    @ApiModelProperty(value = "品牌故事")
-     * 品牌故事
-     *
-     * @mbggenerated
-     */
     private String brandStory;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsComment.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,47 +13,27 @@ public class PmsComment implements Serializable {
 
     private String productName;
 
-    /**
+    @ApiModelProperty(value = "评价星数：0->5")
-     * 评价星数：0->5
-     *
-     * @mbggenerated
-     */
     private Integer star;
 
-    /**
+    @ApiModelProperty(value = "评价的ip")
-     * 评价的ip
-     *
-     * @mbggenerated
-     */
     private String memberIp;
 
     private Date createTime;
 
     private Integer showStatus;
 
-    /**
+    @ApiModelProperty(value = "购买时的商品属性")
-     * 购买时的商品属性
-     *
-     * @mbggenerated
-     */
     private String productAttribute;
 
     private Integer collectCouont;
 
     private Integer readCount;
 
-    /**
+    @ApiModelProperty(value = "上传图片地址，以逗号隔开")
-     * 上传图片地址，以逗号隔开
-     *
-     * @mbggenerated
-     */
     private String pics;
 
-    /**
+    @ApiModelProperty(value = "评论用户头像")
-     * 评论用户头像
-     *
-     * @mbggenerated
-     */
     private String memberIcon;
 
     private Integer replayCount;

mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplay.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -16,11 +17,7 @@ public class PmsCommentReplay implements Serializable {
 
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "评论人员类型；0->会员；1->管理员")
-     * 评论人员类型；0->会员；1->管理员
-     *
-     * @mbggenerated
-     */
     private Integer type;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplate.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -8,36 +9,20 @@ public class PmsFeightTemplate implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "计费类型:0->按重量；1->按件数")
-     * 计费类型:0->按重量；1->按件数
-     *
-     * @mbggenerated
-     */
     private Integer chargeType;
 
-    /**
+    @ApiModelProperty(value = "首重kg")
-     * 首重kg
-     *
-     * @mbggenerated
-     */
     private BigDecimal firstWeight;
 
-    /**
+    @ApiModelProperty(value = "首费（元）")
-     * 首费（元）
-     *
-     * @mbggenerated
-     */
     private BigDecimal firstFee;
 
     private BigDecimal continueWeight;
 
     private BigDecimal continmeFee;
 
-    /**
+    @ApiModelProperty(value = "目的地（省、市）")
-     * 目的地（省、市）
-     *
-     * @mbggenerated
-     */
     private String dest;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPrice.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -10,11 +11,7 @@ public class PmsMemberPrice implements Serializable {
 
     private Long memberLevelId;
 
-    /**
+    @ApiModelProperty(value = "会员价格")
-     * 会员价格
-     *
-     * @mbggenerated
-     */
     private BigDecimal memberPrice;
 
     private String memberLevelName;

mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -19,224 +20,104 @@ public class PmsProduct implements Serializable {
 
     private String pic;
 
-    /**
+    @ApiModelProperty(value = "货号")
-     * 货号
-     *
-     * @mbggenerated
-     */
     private String productSn;
 
-    /**
+    @ApiModelProperty(value = "删除状态：0->未删除；1->已删除")
-     * 删除状态：0->未删除；1->已删除
-     *
-     * @mbggenerated
-     */
     private Integer deleteStatus;
 
-    /**
+    @ApiModelProperty(value = "上架状态：0->下架；1->上架")
-     * 上架状态：0->下架；1->上架
-     *
-     * @mbggenerated
-     */
     private Integer publishStatus;
 
-    /**
+    @ApiModelProperty(value = "新品状态:0->不是新品；1->新品")
-     * 新品状态:0->不是新品；1->新品
-     *
-     * @mbggenerated
-     */
     private Integer newStatus;
 
-    /**
+    @ApiModelProperty(value = "推荐状态；0->不推荐；1->推荐")
-     * 推荐状态；0->不推荐；1->推荐
-     *
-     * @mbggenerated
-     */
     private Integer recommandStatus;
 
-    /**
+    @ApiModelProperty(value = "审核状态：0->未审核；1->审核通过")
-     * 审核状态：0->未审核；1->审核通过
-     *
-     * @mbggenerated
-     */
     private Integer verifyStatus;
 
-    /**
+    @ApiModelProperty(value = "排序")
-     * 排序
-     *
-     * @mbggenerated
-     */
     private Integer sort;
 
-    /**
+    @ApiModelProperty(value = "销量")
-     * 销量
-     *
-     * @mbggenerated
-     */
     private Integer sale;
 
     private BigDecimal price;
 
-    /**
+    @ApiModelProperty(value = "促销价格")
-     * 促销价格
-     *
-     * @mbggenerated
-     */
     private BigDecimal promotionPrice;
 
-    /**
+    @ApiModelProperty(value = "赠送的成长值")
-     * 赠送的成长值
-     *
-     * @mbggenerated
-     */
     private Integer giftGrowth;
 
-    /**
+    @ApiModelProperty(value = "赠送的积分")
-     * 赠送的积分
-     *
-     * @mbggenerated
-     */
     private Integer giftPoint;
 
-    /**
+    @ApiModelProperty(value = "限制使用的积分数")
-     * 限制使用的积分数
-     *
-     * @mbggenerated
-     */
     private Integer usePointLimit;
 
-    /**
+    @ApiModelProperty(value = "副标题")
-     * 副标题
-     *
-     * @mbggenerated
-     */
     private String subTitle;
 
-    /**
+    @ApiModelProperty(value = "市场价")
-     * 市场价
-     *
-     * @mbggenerated
-     */
     private BigDecimal originalPrice;
 
-    /**
+    @ApiModelProperty(value = "库存")
-     * 库存
-     *
-     * @mbggenerated
-     */
     private Integer stock;
 
-    /**
+    @ApiModelProperty(value = "库存预警值")
-     * 库存预警值
-     *
-     * @mbggenerated
-     */
     private Integer lowStock;
 
-    /**
+    @ApiModelProperty(value = "单位")
-     * 单位
-     *
-     * @mbggenerated
-     */
     private String unit;
 
-    /**
+    @ApiModelProperty(value = "商品重量，默认为克")
-     * 商品重量，默认为克
-     *
-     * @mbggenerated
-     */
     private BigDecimal weight;
 
-    /**
+    @ApiModelProperty(value = "是否为预告商品：0->不是；1->是")
-     * 是否为预告商品：0->不是；1->是
-     *
-     * @mbggenerated
-     */
     private Integer previewStatus;
 
-    /**
+    @ApiModelProperty(value = "以逗号分割的产品服务：1->无忧退货；2->快速退款；3->免费包邮")
-     * 以逗号分割的产品服务：1->无忧退货；2->快速退款；3->免费包邮
-     *
-     * @mbggenerated
-     */
     private String serviceIds;
 
     private String keywords;
 
     private String note;
 
-    /**
+    @ApiModelProperty(value = "画册图片，连产品图片限制为5张，以逗号分割")
-     * 画册图片，连产品图片限制为5张，以逗号分割
-     *
-     * @mbggenerated
-     */
     private String albumPics;
 
     private String detailTitle;
 
-    /**
+    @ApiModelProperty(value = "促销开始时间")
-     * 促销开始时间
-     *
-     * @mbggenerated
-     */
     private Date promotionStartTime;
 
-    /**
+    @ApiModelProperty(value = "促销结束时间")
-     * 促销结束时间
-     *
-     * @mbggenerated
-     */
     private Date promotionEndTime;
 
-    /**
+    @ApiModelProperty(value = "活动限购数量")
-     * 活动限购数量
-     *
-     * @mbggenerated
-     */
     private Integer promotionPerLimit;
 
-    /**
+    @ApiModelProperty(value = "促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购")
-     * 促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购
-     *
-     * @mbggenerated
-     */
     private Integer promotionType;
 
-    /**
+    @ApiModelProperty(value = "品牌名称")
-     * 品牌名称
-     *
-     * @mbggenerated
-     */
     private String brandName;
 
-    /**
+    @ApiModelProperty(value = "商品分类名称")
-     * 商品分类名称
-     *
-     * @mbggenerated
-     */
     private String productCategoryName;
 
-    /**
+    @ApiModelProperty(value = "商品描述")
-     * 商品描述
-     *
-     * @mbggenerated
-     */
     private String description;
 
     private String detailDesc;
 
-    /**
+    @ApiModelProperty(value = "产品详情网页内容")
-     * 产品详情网页内容
-     *
-     * @mbggenerated
-     */
     private String detailHtml;
 
-    /**
+    @ApiModelProperty(value = "移动端网页详情")
-     * 移动端网页详情
-     *
-     * @mbggenerated
-     */
     private String detailMobileHtml;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttribute.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsProductAttribute implements Serializable {
@@ -9,67 +10,31 @@ public class PmsProductAttribute implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "属性选择类型：0->唯一；1->单选；2->多选")
-     * 属性选择类型：0->唯一；1->单选；2->多选
-     *
-     * @mbggenerated
-     */
     private Integer selectType;
 
-    /**
+    @ApiModelProperty(value = "属性录入方式：0->手工录入；1->从列表中选取")
-     * 属性录入方式：0->手工录入；1->从列表中选取
-     *
-     * @mbggenerated
-     */
     private Integer inputType;
 
-    /**
+    @ApiModelProperty(value = "可选值列表，以逗号隔开")
-     * 可选值列表，以逗号隔开
-     *
-     * @mbggenerated
-     */
     private String inputList;
 
-    /**
+    @ApiModelProperty(value = "排序字段：最高的可以单独上传图片")
-     * 排序字段：最高的可以单独上传图片
-     *
-     * @mbggenerated
-     */
     private Integer sort;
 
-    /**
+    @ApiModelProperty(value = "分类筛选样式：1->普通；1->颜色")
-     * 分类筛选样式：1->普通；1->颜色
-     *
-     * @mbggenerated
-     */
     private Integer filterType;
 
-    /**
+    @ApiModelProperty(value = "检索类型；0->不需要进行检索；1->关键字检索；2->范围检索")
-     * 检索类型；0->不需要进行检索；1->关键字检索；2->范围检索
-     *
-     * @mbggenerated
-     */
     private Integer searchType;
 
-    /**
+    @ApiModelProperty(value = "相同属性产品是否关联；0->不关联；1->关联")
-     * 相同属性产品是否关联；0->不关联；1->关联
-     *
-     * @mbggenerated
-     */
     private Integer relatedStatus;
 
-    /**
+    @ApiModelProperty(value = "是否支持手动新增；0->不支持；1->支持")
-     * 是否支持手动新增；0->不支持；1->支持
-     *
-     * @mbggenerated
-     */
     private Integer handAddStatus;
 
-    /**
+    @ApiModelProperty(value = "属性的类型；0->规格；1->参数")
-     * 属性的类型；0->规格；1->参数
-     *
-     * @mbggenerated
-     */
     private Integer type;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategory.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsProductAttributeCategory implements Serializable {
@@ -7,18 +8,10 @@ public class PmsProductAttributeCategory implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "属性数量")
-     * 属性数量
-     *
-     * @mbggenerated
-     */
     private Integer attributeCount;
 
-    /**
+    @ApiModelProperty(value = "参数数量")
-     * 参数数量
-     *
-     * @mbggenerated
-     */
     private Integer paramCount;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValue.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsProductAttributeValue implements Serializable {
@@ -9,11 +10,7 @@ public class PmsProductAttributeValue implements Serializable {
 
     private Long productAttributeId;
 
-    /**
+    @ApiModelProperty(value = "手动添加规格或参数的值，参数单值，规格有多个时以逗号隔开")
-     * 手动添加规格或参数的值，参数单值，规格有多个时以逗号隔开
-     *
-     * @mbggenerated
-     */
     private String value;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategory.java

@@ -1,60 +1,37 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsProductCategory implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "上机分类的编号：0表示一级分类")
-     * 上机分类的编号：0表示一级分类
-     *
-     * @mbggenerated
-     */
     private Long parentId;
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "分类级别：0->1级；1->2级")
-     * 分类级别：0->1级；1->2级
-     *
-     * @mbggenerated
-     */
     private Integer level;
 
     private Integer productCount;
 
     private String productUnit;
 
-    /**
+    @ApiModelProperty(value = "是否显示在导航栏：0->不显示；1->显示")
-     * 是否显示在导航栏：0->不显示；1->显示
-     *
-     * @mbggenerated
-     */
     private Integer navStatus;
 
-    /**
+    @ApiModelProperty(value = "显示状态：0->不显示；1->显示")
-     * 显示状态：0->不显示；1->显示
-     *
-     * @mbggenerated
-     */
     private Integer showStatus;
 
     private Integer sort;
 
-    /**
+    @ApiModelProperty(value = "图标")
-     * 图标
-     *
-     * @mbggenerated
-     */
     private String icon;
 
     private String keywords;
 
-    /**
+    @ApiModelProperty(value = "描述")
-     * 描述
-     *
-     * @mbggenerated
-     */
     private String description;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryAttributeRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class PmsProductCategoryAttributeRelation implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/PmsProductFullReduction.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 

mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadder.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -8,25 +9,13 @@ public class PmsProductLadder implements Serializable {
 
     private Long productId;
 
-    /**
+    @ApiModelProperty(value = "满足的商品数量")
-     * 满足的商品数量
-     *
-     * @mbggenerated
-     */
     private Integer count;
 
-    /**
+    @ApiModelProperty(value = "折扣")
-     * 折扣
-     *
-     * @mbggenerated
-     */
     private BigDecimal discount;
 
-    /**
+    @ApiModelProperty(value = "折后价格")
-     * 折后价格
-     *
-     * @mbggenerated
-     */
     private BigDecimal price;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLog.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -17,11 +18,7 @@ public class PmsProductOperateLog implements Serializable {
 
     private BigDecimal salePriceNew;
 
-    /**
+    @ApiModelProperty(value = "赠送的积分")
-     * 赠送的积分
-     *
-     * @mbggenerated
-     */
     private Integer giftPointOld;
 
     private Integer giftPointNew;
@@ -30,11 +27,7 @@ public class PmsProductOperateLog implements Serializable {
 
     private Integer usePointLimitNew;
 
-    /**
+    @ApiModelProperty(value = "操作人")
-     * 操作人
-     *
-     * @mbggenerated
-     */
     private String operateMan;
 
     private Date createTime;

mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecord.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,20 +11,12 @@ public class PmsProductVertifyRecord implements Serializable {
 
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "审核人")
-     * 审核人
-     *
-     * @mbggenerated
-     */
     private String vertifyMan;
 
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "反馈详情")
-     * 反馈详情
-     *
-     * @mbggenerated
-     */
     private String detail;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStock.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -8,66 +9,34 @@ public class PmsSkuStock implements Serializable {
 
     private Long productId;
 
-    /**
+    @ApiModelProperty(value = "sku编码")
-     * sku编码
-     *
-     * @mbggenerated
-     */
     private String skuCode;
 
     private BigDecimal price;
 
-    /**
+    @ApiModelProperty(value = "库存")
-     * 库存
-     *
-     * @mbggenerated
-     */
     private Integer stock;
 
-    /**
+    @ApiModelProperty(value = "预警库存")
-     * 预警库存
-     *
-     * @mbggenerated
-     */
     private Integer lowStock;
 
-    /**
+    @ApiModelProperty(value = "销售属性1")
-     * 销售属性1
-     *
-     * @mbggenerated
-     */
     private String sp1;
 
     private String sp2;
 
     private String sp3;
 
-    /**
+    @ApiModelProperty(value = "展示图片")
-     * 展示图片
-     *
-     * @mbggenerated
-     */
     private String pic;
 
-    /**
+    @ApiModelProperty(value = "销量")
-     * 销量
-     *
-     * @mbggenerated
-     */
     private Integer sale;
 
-    /**
+    @ApiModelProperty(value = "单品促销价格")
-     * 单品促销价格
-     *
-     * @mbggenerated
-     */
     private BigDecimal promotionPrice;
 
-    /**
+    @ApiModelProperty(value = "锁定库存")
-     * 锁定库存
-     *
-     * @mbggenerated
-     */
     private Integer lockStock;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -7,108 +8,52 @@ import java.util.Date;
 public class SmsCoupon implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券")
-     * 优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券
-     *
-     * @mbggenerated
-     */
     private Integer type;
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "使用平台：0->全部；1->移动；2->PC")
-     * 使用平台：0->全部；1->移动；2->PC
-     *
-     * @mbggenerated
-     */
     private Integer platform;
 
-    /**
+    @ApiModelProperty(value = "数量")
-     * 数量
-     *
-     * @mbggenerated
-     */
     private Integer count;
 
-    /**
+    @ApiModelProperty(value = "金额")
-     * 金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal amount;
 
-    /**
+    @ApiModelProperty(value = "每人限领张数")
-     * 每人限领张数
-     *
-     * @mbggenerated
-     */
     private Integer perLimit;
 
-    /**
+    @ApiModelProperty(value = "使用门槛；0表示无门槛")
-     * 使用门槛；0表示无门槛
-     *
-     * @mbggenerated
-     */
     private BigDecimal minPoint;
 
     private Date startTime;
 
     private Date endTime;
 
-    /**
+    @ApiModelProperty(value = "使用类型：0->全场通用；1->指定分类；2->指定商品")
-     * 使用类型：0->全场通用；1->指定分类；2->指定商品
-     *
-     * @mbggenerated
-     */
     private Integer useType;
 
-    /**
+    @ApiModelProperty(value = "备注")
-     * 备注
-     *
-     * @mbggenerated
-     */
     private String note;
 
-    /**
+    @ApiModelProperty(value = "发行数量")
-     * 发行数量
-     *
-     * @mbggenerated
-     */
     private Integer publishCount;
 
-    /**
+    @ApiModelProperty(value = "已使用数量")
-     * 已使用数量
-     *
-     * @mbggenerated
-     */
     private Integer useCount;
 
-    /**
+    @ApiModelProperty(value = "领取数量")
-     * 领取数量
-     *
-     * @mbggenerated
-     */
     private Integer receiveCount;
 
-    /**
+    @ApiModelProperty(value = "可以领取的日期")
-     * 可以领取的日期
-     *
-     * @mbggenerated
-     */
     private Date enableTime;
 
-    /**
+    @ApiModelProperty(value = "优惠码")
-     * 优惠码
-     *
-     * @mbggenerated
-     */
     private String code;
 
-    /**
+    @ApiModelProperty(value = "可领取的会员类型：0->无限时")
-     * 可领取的会员类型：0->无限时
-     *
-     * @mbggenerated
-     */
     private Integer memberLevel;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistory.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,48 +13,24 @@ public class SmsCouponHistory implements Serializable {
 
     private String couponCode;
 
-    /**
+    @ApiModelProperty(value = "领取人昵称")
-     * 领取人昵称
-     *
-     * @mbggenerated
-     */
     private String memberNickname;
 
-    /**
+    @ApiModelProperty(value = "获取类型：0->后台赠送；1->主动获取")
-     * 获取类型：0->后台赠送；1->主动获取
-     *
-     * @mbggenerated
-     */
     private Integer getType;
 
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "使用状态：0->未使用；1->已使用；2->已过期")
-     * 使用状态：0->未使用；1->已使用；2->已过期
-     *
-     * @mbggenerated
-     */
     private Integer useStatus;
 
-    /**
+    @ApiModelProperty(value = "使用时间")
-     * 使用时间
-     *
-     * @mbggenerated
-     */
     private Date useTime;
 
-    /**
+    @ApiModelProperty(value = "订单编号")
-     * 订单编号
-     *
-     * @mbggenerated
-     */
     private Long orderId;
 
-    /**
+    @ApiModelProperty(value = "订单号码")
-     * 订单号码
-     *
-     * @mbggenerated
-     */
     private String orderSn;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class SmsCouponProductCategoryRelation implements Serializable {
@@ -9,18 +10,10 @@ public class SmsCouponProductCategoryRelation implements Serializable {
 
     private Long productCategoryId;
 
-    /**
+    @ApiModelProperty(value = "产品分类名称")
-     * 产品分类名称
-     *
-     * @mbggenerated
-     */
     private String productCategoryName;
 
-    /**
+    @ApiModelProperty(value = "父分类名称")
-     * 父分类名称
-     *
-     * @mbggenerated
-     */
     private String parentCategoryName;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class SmsCouponProductRelation implements Serializable {
@@ -9,18 +10,10 @@ public class SmsCouponProductRelation implements Serializable {
 
     private Long productId;
 
-    /**
+    @ApiModelProperty(value = "商品名称")
-     * 商品名称
-     *
-     * @mbggenerated
-     */
     private String productName;
 
-    /**
+    @ApiModelProperty(value = "商品编码")
-     * 商品编码
-     *
-     * @mbggenerated
-     */
     private String productSn;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotion.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,32 +9,16 @@ public class SmsFlashPromotion implements Serializable {
 
     private String title;
 
-    /**
+    @ApiModelProperty(value = "开始日期")
-     * 开始日期
-     *
-     * @mbggenerated
-     */
     private Date startDate;
 
-    /**
+    @ApiModelProperty(value = "结束日期")
-     * 结束日期
-     *
-     * @mbggenerated
-     */
     private Date endDate;
 
-    /**
+    @ApiModelProperty(value = "上下线状态")
-     * 上下线状态
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "秒杀时间段名称")
-     * 秒杀时间段名称
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLog.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,11 +15,7 @@ public class SmsFlashPromotionLog implements Serializable {
 
     private String productName;
 
-    /**
+    @ApiModelProperty(value = "会员订阅时间")
-     * 会员订阅时间
-     *
-     * @mbggenerated
-     */
     private Date subscribeTime;
 
     private Date sendTime;

mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionProductRelation.java

@@ -1,53 +1,30 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 public class SmsFlashPromotionProductRelation implements Serializable {
-    /**
+    @ApiModelProperty(value = "编号")
-     * 编号
-     *
-     * @mbggenerated
-     */
     private Long id;
 
     private Long flashPromotionId;
 
-    /**
+    @ApiModelProperty(value = "编号")
-     * 编号
-     *
-     * @mbggenerated
-     */
     private Long flashPromotionSessionId;
 
     private Long productId;
 
-    /**
+    @ApiModelProperty(value = "限时购价格")
-     * 限时购价格
-     *
-     * @mbggenerated
-     */
     private BigDecimal flashPromotionPrice;
 
-    /**
+    @ApiModelProperty(value = "限时购数量")
-     * 限时购数量
-     *
-     * @mbggenerated
-     */
     private Integer flashPromotionCount;
 
-    /**
+    @ApiModelProperty(value = "每人限购数量")
-     * 每人限购数量
-     *
-     * @mbggenerated
-     */
     private Integer flashPromotionLimit;
 
-    /**
+    @ApiModelProperty(value = "排序")
-     * 排序
-     *
-     * @mbggenerated
-     */
     private Integer sort;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionSession.java

@@ -1,49 +1,26 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
 public class SmsFlashPromotionSession implements Serializable {
-    /**
+    @ApiModelProperty(value = "编号")
-     * 编号
-     *
-     * @mbggenerated
-     */
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "场次名称")
-     * 场次名称
-     *
-     * @mbggenerated
-     */
     private String name;
 
-    /**
+    @ApiModelProperty(value = "每日开始时间")
-     * 每日开始时间
-     *
-     * @mbggenerated
-     */
     private Date startTime;
 
-    /**
+    @ApiModelProperty(value = "每日结束时间")
-     * 每日结束时间
-     *
-     * @mbggenerated
-     */
     private Date endTime;
 
-    /**
+    @ApiModelProperty(value = "启用状态：0->不启用；1->启用")
-     * 启用状态：0->不启用；1->启用
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertise.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,11 +9,7 @@ public class SmsHomeAdvertise implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "轮播位置：0->PC首页轮播；1->app首页轮播")
-     * 轮播位置：0->PC首页轮播；1->app首页轮播
-     *
-     * @mbggenerated
-     */
     private Integer type;
 
     private String pic;
@@ -21,46 +18,22 @@ public class SmsHomeAdvertise implements Serializable {
 
     private Date endTime;
 
-    /**
+    @ApiModelProperty(value = "上下线状态：0->下线；1->上线")
-     * 上下线状态：0->下线；1->上线
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "点击数")
-     * 点击数
-     *
-     * @mbggenerated
-     */
     private Integer clickCount;
 
-    /**
+    @ApiModelProperty(value = "下单数")
-     * 下单数
-     *
-     * @mbggenerated
-     */
     private Integer orderCount;
 
-    /**
+    @ApiModelProperty(value = "链接地址")
-     * 链接地址
-     *
-     * @mbggenerated
-     */
     private String url;
 
-    /**
+    @ApiModelProperty(value = "备注")
-     * 备注
-     *
-     * @mbggenerated
-     */
     private String note;
 
-    /**
+    @ApiModelProperty(value = "排序")
-     * 排序
-     *
-     * @mbggenerated
-     */
     private Integer sort;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/SmsHomeBrand.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class SmsHomeBrand implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/SmsHomeNewProduct.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class SmsHomeNewProduct implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendProduct.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class SmsHomeRecommendProduct implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendSubject.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class SmsHomeRecommendSubject implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/UmsAdmin.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,53 +11,25 @@ public class UmsAdmin implements Serializable {
 
     private String password;
 
-    /**
+    @ApiModelProperty(value = "头像")
-     * 头像
-     *
-     * @mbggenerated
-     */
     private String icon;
 
-    /**
+    @ApiModelProperty(value = "邮箱")
-     * 邮箱
-     *
-     * @mbggenerated
-     */
     private String email;
 
-    /**
+    @ApiModelProperty(value = "昵称")
-     * 昵称
-     *
-     * @mbggenerated
-     */
     private String nickName;
 
-    /**
+    @ApiModelProperty(value = "备注信息")
-     * 备注信息
-     *
-     * @mbggenerated
-     */
     private String note;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "最后登录时间")
-     * 最后登录时间
-     *
-     * @mbggenerated
-     */
     private Date loginTime;
 
-    /**
+    @ApiModelProperty(value = "帐号启用状态：0->禁用；1->启用")
-     * 帐号启用状态：0->禁用；1->启用
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLog.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,11 +15,7 @@ public class UmsAdminLoginLog implements Serializable {
 
     private String address;
 
-    /**
+    @ApiModelProperty(value = "浏览器登录类型")
-     * 浏览器登录类型
-     *
-     * @mbggenerated
-     */
     private String userAgent;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsAdminPermissionRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsAdminPermissionRelation implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/UmsAdminRoleRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsAdminRoleRelation implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistory.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,39 +11,19 @@ public class UmsGrowthChangeHistory implements Serializable {
 
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "改变类型：0->增加；1->减少")
-     * 改变类型：0->增加；1->减少
-     *
-     * @mbggenerated
-     */
     private Integer changeType;
 
-    /**
+    @ApiModelProperty(value = "积分改变数量")
-     * 积分改变数量
-     *
-     * @mbggenerated
-     */
     private Integer changeCount;
 
-    /**
+    @ApiModelProperty(value = "操作人员")
-     * 操作人员
-     *
-     * @mbggenerated
-     */
     private String operateMan;
 
-    /**
+    @ApiModelProperty(value = "操作备注")
-     * 操作备注
-     *
-     * @mbggenerated
-     */
     private String operateNote;
 
-    /**
+    @ApiModelProperty(value = "积分来源：0->购物；1->管理员修改")
-     * 积分来源：0->购物；1->管理员修改
-     *
-     * @mbggenerated
-     */
     private Integer sourceType;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistory.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,39 +11,19 @@ public class UmsIntegrationChangeHistory implements Serializable {
 
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "改变类型：0->增加；1->减少")
-     * 改变类型：0->增加；1->减少
-     *
-     * @mbggenerated
-     */
     private Integer changeType;
 
-    /**
+    @ApiModelProperty(value = "积分改变数量")
-     * 积分改变数量
-     *
-     * @mbggenerated
-     */
     private Integer changeCount;
 
-    /**
+    @ApiModelProperty(value = "操作人员")
-     * 操作人员
-     *
-     * @mbggenerated
-     */
     private String operateMan;
 
-    /**
+    @ApiModelProperty(value = "操作备注")
-     * 操作备注
-     *
-     * @mbggenerated
-     */
     private String operateNote;
 
-    /**
+    @ApiModelProperty(value = "积分来源：0->购物；1->管理员修改")
-     * 积分来源：0->购物；1->管理员修改
-     *
-     * @mbggenerated
-     */
     private Integer sourceType;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSetting.java

@@ -1,36 +1,21 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsIntegrationConsumeSetting implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "每一元需要抵扣的积分数量")
-     * 每一元需要抵扣的积分数量
-     *
-     * @mbggenerated
-     */
     private Integer deductionPerAmount;
 
-    /**
+    @ApiModelProperty(value = "每笔订单最高抵用百分比")
-     * 每笔订单最高抵用百分比
-     *
-     * @mbggenerated
-     */
     private Integer maxPercentPerOrder;
 
-    /**
+    @ApiModelProperty(value = "每次使用积分最小单位100")
-     * 每次使用积分最小单位100
-     *
-     * @mbggenerated
-     */
     private Integer useUnit;
 
-    /**
+    @ApiModelProperty(value = "是否可以和优惠券同用；0->不可以；1->可以")
-     * 是否可以和优惠券同用；0->不可以；1->可以
-     *
-     * @mbggenerated
-     */
     private Integer couponStatus;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsMember.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,123 +9,55 @@ public class UmsMember implements Serializable {
 
     private Long memberLevelId;
 
-    /**
+    @ApiModelProperty(value = "用户名")
-     * 用户名
-     *
-     * @mbggenerated
-     */
     private String username;
 
-    /**
+    @ApiModelProperty(value = "密码")
-     * 密码
-     *
-     * @mbggenerated
-     */
     private String password;
 
-    /**
+    @ApiModelProperty(value = "昵称")
-     * 昵称
-     *
-     * @mbggenerated
-     */
     private String nickname;
 
-    /**
+    @ApiModelProperty(value = "手机号码")
-     * 手机号码
-     *
-     * @mbggenerated
-     */
     private String phone;
 
-    /**
+    @ApiModelProperty(value = "帐号启用状态:0->禁用；1->启用")
-     * 帐号启用状态:0->禁用；1->启用
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "注册时间")
-     * 注册时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "头像")
-     * 头像
-     *
-     * @mbggenerated
-     */
     private String icon;
 
-    /**
+    @ApiModelProperty(value = "性别：0->未知；1->男；2->女")
-     * 性别：0->未知；1->男；2->女
-     *
-     * @mbggenerated
-     */
     private Integer gender;
 
-    /**
+    @ApiModelProperty(value = "生日")
-     * 生日
-     *
-     * @mbggenerated
-     */
     private Date birthday;
 
-    /**
+    @ApiModelProperty(value = "所做城市")
-     * 所做城市
-     *
-     * @mbggenerated
-     */
     private String city;
 
-    /**
+    @ApiModelProperty(value = "职业")
-     * 职业
-     *
-     * @mbggenerated
-     */
     private String job;
 
-    /**
+    @ApiModelProperty(value = "个性签名")
-     * 个性签名
-     *
-     * @mbggenerated
-     */
     private String personalizedSignature;
 
-    /**
+    @ApiModelProperty(value = "用户来源")
-     * 用户来源
-     *
-     * @mbggenerated
-     */
     private Integer sourceType;
 
-    /**
+    @ApiModelProperty(value = "积分")
-     * 积分
-     *
-     * @mbggenerated
-     */
     private Integer integration;
 
-    /**
+    @ApiModelProperty(value = "成长值")
-     * 成长值
-     *
-     * @mbggenerated
-     */
     private Integer growth;
 
-    /**
+    @ApiModelProperty(value = "剩余抽奖次数")
-     * 剩余抽奖次数
-     *
-     * @mbggenerated
-     */
     private Integer luckeyCount;
 
-    /**
+    @ApiModelProperty(value = "历史积分数量")
-     * 历史积分数量
-     *
-     * @mbggenerated
-     */
     private Integer historyIntegration;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevel.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -10,67 +11,31 @@ public class UmsMemberLevel implements Serializable {
 
     private Integer growthPoint;
 
-    /**
+    @ApiModelProperty(value = "是否为默认等级：0->不是；1->是")
-     * 是否为默认等级：0->不是；1->是
-     *
-     * @mbggenerated
-     */
     private Integer defaultStatus;
 
-    /**
+    @ApiModelProperty(value = "免运费标准")
-     * 免运费标准
-     *
-     * @mbggenerated
-     */
     private BigDecimal freeFreightPoint;
 
-    /**
+    @ApiModelProperty(value = "每次评价获取的成长值")
-     * 每次评价获取的成长值
-     *
-     * @mbggenerated
-     */
     private Integer commentGrowthPoint;
 
-    /**
+    @ApiModelProperty(value = "是否有免邮特权")
-     * 是否有免邮特权
-     *
-     * @mbggenerated
-     */
     private Integer priviledgeFreeFreight;
 
-    /**
+    @ApiModelProperty(value = "是否有签到特权")
-     * 是否有签到特权
-     *
-     * @mbggenerated
-     */
     private Integer priviledgeSignIn;
 
-    /**
+    @ApiModelProperty(value = "是否有评论获奖励特权")
-     * 是否有评论获奖励特权
-     *
-     * @mbggenerated
-     */
     private Integer priviledgeComment;
 
-    /**
+    @ApiModelProperty(value = "是否有专享活动特权")
-     * 是否有专享活动特权
-     *
-     * @mbggenerated
-     */
     private Integer priviledgePromotion;
 
-    /**
+    @ApiModelProperty(value = "是否有会员价格特权")
-     * 是否有会员价格特权
-     *
-     * @mbggenerated
-     */
     private Integer priviledgeMemberPrice;
 
-    /**
+    @ApiModelProperty(value = "是否有生日特权")
-     * 是否有生日特权
-     *
-     * @mbggenerated
-     */
     private Integer priviledgeBirthday;
 
     private String note;

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLog.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,11 +15,7 @@ public class UmsMemberLoginLog implements Serializable {
 
     private String city;
 
-    /**
+    @ApiModelProperty(value = "登录类型：0->PC；1->android;2->ios;3->小程序")
-     * 登录类型：0->PC；1->android;2->ios;3->小程序
-     *
-     * @mbggenerated
-     */
     private Integer loginType;
 
     private String province;

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberMemberTagRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsMemberMemberTagRelation implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberProductCategoryRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsMemberProductCategoryRelation implements Serializable {

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsMemberReceiveAddress implements Serializable {
@@ -7,55 +8,27 @@ public class UmsMemberReceiveAddress implements Serializable {
 
     private Long memberId;
 
-    /**
+    @ApiModelProperty(value = "收货人名称")
-     * 收货人名称
-     *
-     * @mbggenerated
-     */
     private String name;
 
     private String phoneNumber;
 
-    /**
+    @ApiModelProperty(value = "是否为默认")
-     * 是否为默认
-     *
-     * @mbggenerated
-     */
     private Integer defaultStatus;
 
-    /**
+    @ApiModelProperty(value = "邮政编码")
-     * 邮政编码
-     *
-     * @mbggenerated
-     */
     private String postCode;
 
-    /**
+    @ApiModelProperty(value = "省份/直辖市")
-     * 省份/直辖市
-     *
-     * @mbggenerated
-     */
     private String province;
 
-    /**
+    @ApiModelProperty(value = "城市")
-     * 城市
-     *
-     * @mbggenerated
-     */
     private String city;
 
-    /**
+    @ApiModelProperty(value = "区")
-     * 区
-     *
-     * @mbggenerated
-     */
     private String region;
 
-    /**
+    @ApiModelProperty(value = "详细地址(街道)")
-     * 详细地址(街道)
-     *
-     * @mbggenerated
-     */
     private String detailAddress;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSetting.java

@@ -1,51 +1,28 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 public class UmsMemberRuleSetting implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "连续签到天数")
-     * 连续签到天数
-     *
-     * @mbggenerated
-     */
     private Integer continueSignDay;
 
-    /**
+    @ApiModelProperty(value = "连续签到赠送数量")
-     * 连续签到赠送数量
-     *
-     * @mbggenerated
-     */
     private Integer continueSignPoint;
 
-    /**
+    @ApiModelProperty(value = "每消费多少元获取1个点")
-     * 每消费多少元获取1个点
-     *
-     * @mbggenerated
-     */
     private BigDecimal consumePerPoint;
 
-    /**
+    @ApiModelProperty(value = "最低获取点数的订单金额")
-     * 最低获取点数的订单金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal lowOrderAmount;
 
-    /**
+    @ApiModelProperty(value = "每笔订单最高获取点数")
-     * 每笔订单最高获取点数
-     *
-     * @mbggenerated
-     */
     private Integer maxPointPerOrder;
 
-    /**
+    @ApiModelProperty(value = "类型：0->积分规则；1->成长值规则")
-     * 类型：0->积分规则；1->成长值规则
-     *
-     * @mbggenerated
-     */
     private Integer type;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfo.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -9,60 +10,28 @@ public class UmsMemberStatisticsInfo implements Serializable {
 
     private Long memberId;
 
-    /**
+    @ApiModelProperty(value = "累计消费金额")
-     * 累计消费金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal consumeAmount;
 
-    /**
+    @ApiModelProperty(value = "订单数量")
-     * 订单数量
-     *
-     * @mbggenerated
-     */
     private Integer orderCount;
 
-    /**
+    @ApiModelProperty(value = "优惠券数量")
-     * 优惠券数量
-     *
-     * @mbggenerated
-     */
     private Integer couponCount;
 
-    /**
+    @ApiModelProperty(value = "评价数")
-     * 评价数
-     *
-     * @mbggenerated
-     */
     private Integer commentCount;
 
-    /**
+    @ApiModelProperty(value = "退货数量")
-     * 退货数量
-     *
-     * @mbggenerated
-     */
     private Integer returnOrderCount;
 
-    /**
+    @ApiModelProperty(value = "登录次数")
-     * 登录次数
-     *
-     * @mbggenerated
-     */
     private Integer loginCount;
 
-    /**
+    @ApiModelProperty(value = "关注数量")
-     * 关注数量
-     *
-     * @mbggenerated
-     */
     private Integer attendCount;
 
-    /**
+    @ApiModelProperty(value = "粉丝数量")
-     * 粉丝数量
-     *
-     * @mbggenerated
-     */
     private Integer fansCount;
 
     private Integer collectProductCount;
@@ -75,11 +44,7 @@ public class UmsMemberStatisticsInfo implements Serializable {
 
     private Integer inviteFriendCount;
 
-    /**
+    @ApiModelProperty(value = "最后一次下订单时间")
-     * 最后一次下订单时间
-     *
-     * @mbggenerated
-     */
     private Date recentOrderTime;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTag.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -8,18 +9,10 @@ public class UmsMemberTag implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "自动打标签完成订单数量")
-     * 自动打标签完成订单数量
-     *
-     * @mbggenerated
-     */
     private Integer finishOrderCount;
 
-    /**
+    @ApiModelProperty(value = "自动打标签完成订单金额")
-     * 自动打标签完成订单金额
-     *
-     * @mbggenerated
-     */
     private BigDecimal finishOrderAmount;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTask.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsMemberTask implements Serializable {
@@ -7,25 +8,13 @@ public class UmsMemberTask implements Serializable {
 
     private String name;
 
-    /**
+    @ApiModelProperty(value = "赠送成长值")
-     * 赠送成长值
-     *
-     * @mbggenerated
-     */
     private Integer growth;
 
-    /**
+    @ApiModelProperty(value = "赠送积分")
-     * 赠送积分
-     *
-     * @mbggenerated
-     */
     private Integer intergration;
 
-    /**
+    @ApiModelProperty(value = "任务类型：0->新手任务；1->日常任务")
-     * 任务类型：0->新手任务；1->日常任务
-     *
-     * @mbggenerated
-     */
     private Integer type;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsPermission.java

@@ -1,72 +1,37 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
 public class UmsPermission implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "父级权限id")
-     * 父级权限id
-     *
-     * @mbggenerated
-     */
     private Long pid;
 
-    /**
+    @ApiModelProperty(value = "名称")
-     * 名称
-     *
-     * @mbggenerated
-     */
     private String name;
 
-    /**
+    @ApiModelProperty(value = "权限值")
-     * 权限值
-     *
-     * @mbggenerated
-     */
     private String value;
 
-    /**
+    @ApiModelProperty(value = "图标")
-     * 图标
-     *
-     * @mbggenerated
-     */
     private String icon;
 
-    /**
+    @ApiModelProperty(value = "权限类型：0->目录；1->菜单；2->按钮（接口绑定权限）")
-     * 权限类型：0->目录；1->菜单；2->按钮（接口绑定权限）
-     *
-     * @mbggenerated
-     */
     private Integer type;
 
-    /**
+    @ApiModelProperty(value = "前端资源路径")
-     * 前端资源路径
-     *
-     * @mbggenerated
-     */
     private String uri;
 
-    /**
+    @ApiModelProperty(value = "启用状态；0->禁用；1->启用")
-     * 启用状态；0->禁用；1->启用
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "排序")
-     * 排序
-     *
-     * @mbggenerated
-     */
     private Integer sort;
 
     private static final long serialVersionUID = 1L;

mall-mbg/src/main/java/com/macro/mall/model/UmsRole.java

@@ -1,44 +1,25 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
 public class UmsRole implements Serializable {
     private Long id;
 
-    /**
+    @ApiModelProperty(value = "名称")
-     * 名称
-     *
-     * @mbggenerated
-     */
     private String name;
 
-    /**
+    @ApiModelProperty(value = "描述")
-     * 描述
-     *
-     * @mbggenerated
-     */
     private String description;
 
-    /**
+    @ApiModelProperty(value = "后台用户数量")
-     * 后台用户数量
-     *
-     * @mbggenerated
-     */
     private Integer adminCount;
 
-    /**
+    @ApiModelProperty(value = "创建时间")
-     * 创建时间
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
+    @ApiModelProperty(value = "启用状态：0->禁用；1->启用")
-     * 启用状态：0->禁用；1->启用
-     *
-     * @mbggenerated
-     */
     private Integer status;
 
     private Integer sort;

mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelation.java

@@ -1,5 +1,6 @@
 package com.macro.mall.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 public class UmsRolePermissionRelation implements Serializable {