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,6 +37,20 @@ public class CommentGenerator extends DefaultCommentGenerator {
         String remarks = introspectedColumn.getRemarks();
         //根据参数和备注信息判断是否添加备注信息
         if(addRemarkComments&&StringUtility.stringHasValue(remarks)){
+//            addFieldJavaDoc(field, remarks);
+            //数据库中特殊字符需要转义
+            if(remarks.contains("\"")){
+                remarks = remarks.replace("\"","'");
+            }
+            //给model的字段添加swagger注解
+            field.addJavaDocLine("@ApiModelProperty(value = \""+remarks+"\")");
+        }
+    }
+
+    /**
+     * 给model的字段添加注释
+     */
+    private void addFieldJavaDoc(Field field, String remarks) {
         //文档注释开始
         field.addJavaDocLine("/**");
         //获取数据库字段的备注信息
@@ -43,5 +61,13 @@ public class CommentGenerator extends DefaultCommentGenerator {
         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

 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

 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;
 
-    /**
-     * 分类图标
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "分类图标")
     private String icon;
 
-    /**
-     * 专题数量
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "专题数量")
     private Integer helpCount;
 
     private Integer showStatus;

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

 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;
 
-    /**
-     * 举报类型：0->商品评价；1->话题内容；2->用户评论
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "举报类型：0->商品评价；1->话题内容；2->用户评论")
     private Integer reportType;
 
-    /**
-     * 举报人
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "举报人")
     private String reportMemberName;
 
     private Date createTime;
 
     private String reportObject;
 
-    /**
-     * 举报状态：0->未处理；1->已处理
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "举报状态：0->未处理；1->已处理")
     private Integer reportStatus;
 
-    /**
-     * 处理结果：0->无效；1->有效；2->恶意
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "处理结果：0->无效；1->有效；2->恶意")
     private Integer handleStatus;
 
     private String note;

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

 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;
 
-    /**
-     * 展示图片
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "展示图片")
     private byte[] pic;
 
     private static final long serialVersionUID = 1L;

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

 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

 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;
 
-    /**
-     * 专题主图
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "专题主图")
     private String pic;
 
-    /**
-     * 关联产品数量
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "关联产品数量")
     private Integer productCount;
 
     private Integer recommendStatus;
@@ -34,34 +27,18 @@ public class CmsSubject implements Serializable {
 
     private Integer commentCount;
 
-    /**
-     * 画册图片用逗号分割
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "画册图片用逗号分割")
     private String albumPics;
 
     private String description;
 
-    /**
-     * 显示状态：0->不显示；1->显示
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "显示状态：0->不显示；1->显示")
     private Integer showStatus;
 
-    /**
-     * 转发数
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "转发数")
     private Integer forwardCount;
 
-    /**
-     * 专题分类名称
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "专题分类名称")
     private String categoryName;
 
     private String content;

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

 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;
 
-    /**
-     * 分类图标
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "分类图标")
     private String icon;
 
-    /**
-     * 专题数量
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "专题数量")
     private Integer subjectCount;
 
     private Integer showStatus;

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

 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

 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

 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;
 
-    /**
-     * 参与人数
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "参与人数")
     private Integer attendCount;
 
-    /**
-     * 关注人数
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "关注人数")
     private Integer attentionCount;
 
     private Integer readCount;
 
-    /**
-     * 奖品名称
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "奖品名称")
     private String awardName;
 
-    /**
-     * 参与方式
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "参与方式")
     private String attendType;
 
-    /**
-     * 话题内容
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "话题内容")
     private String content;
 
     private static final long serialVersionUID = 1L;

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

 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;
 
-    /**
-     * 分类图标
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "分类图标")
     private String icon;
 
-    /**
-     * 专题数量
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "专题数量")
     private Integer subjectCount;
 
     private Integer showStatus;

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

 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

 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;
 
-    /**
-     * 购买数量
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "购买数量")
     private Integer quantity;
 
-    /**
-     * 添加到购物车的价格
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "添加到购物车的价格")
     private BigDecimal price;
 
-    /**
-     * 销售属性1
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "销售属性1")
     private String sp1;
 
-    /**
-     * 销售属性2
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "销售属性2")
     private String sp2;
 
-    /**
-     * 销售属性3
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "销售属性3")
     private String sp3;
 
-    /**
-     * 商品主图
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "商品主图")
     private String productPic;
 
-    /**
-     * 商品名称
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "商品名称")
     private String productName;
 
-    /**
-     * 商品副标题（卖点）
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "商品副标题（卖点）")
     private String productSubTitle;
 
-    /**
-     * 商品sku条码
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "商品sku条码")
     private String productSkuCode;
 
-    /**
-     * 会员昵称
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "会员昵称")
     private String memberNickname;
 
-    /**
-     * 创建时间
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
-    /**
-     * 修改时间
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "修改时间")
     private Date modifyDate;
 
-    /**
-     * 是否删除
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "是否删除")
     private Integer deleteStatus;
 
-    /**
-     * 商品分类
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "商品分类")
     private Long productCategoryId;
 
     private String productBrand;
 
     private String productSn;
 
-    /**
-     * 商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
     private String productAttr;
 
     private static final long serialVersionUID = 1L;

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

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

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

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

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

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

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

 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;
 
-    /**
-     * 订单id
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "订单id")
     private Long orderId;
 
-    /**
-     * 操作人：用户；系统；后台管理员
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "操作人：用户；系统；后台管理员")
     private String operateMan;
 
-    /**
-     * 操作时间
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "操作时间")
     private Date createTime;
 
-    /**
-     * 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
     private Integer orderStatus;
 
-    /**
-     * 备注
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "备注")
     private String note;
 
     private static final long serialVersionUID = 1L;

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

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

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

 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;
 
-    /**
-     * 退货类型
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "退货类型")
     private String name;
 
     private Integer sort;
 
-    /**
-     * 状态：0->不启用；1->启用
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "状态：0->不启用；1->启用")
     private Integer status;
 
-    /**
-     * 添加时间
-     *
-     * @mbggenerated
-     */
+    @ApiModelProperty(value = "添加时间")
     private Date createTime;
 
     private static final long serialVersionUID = 1L;