Merge branch 'auction-dev' of AHX-Bid/poyee-app into dev

poyee-order/src/main/java/com/tzy/entity/LotOrder.java

@@ -1,5 +1,7 @@
 package com.tzy.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.ibatis.type.Alias;
 
@@ -10,38 +12,55 @@ import java.util.Date;
  */
 @Data
 @Alias("lotOrder")
+@ApiModel("拍品订单")
 public class LotOrder {
 
     private Long id;
+    @ApiModelProperty("订单编号")
     private String orderNo;
+    @ApiModelProperty("拍卖会id")
     private Long auctionId;
     //拍卖会名称
+    @ApiModelProperty("拍卖会名称")
     private String auctionName;
     //拍品名称
+    @ApiModelProperty("拍品名称")
     private String lotName;
     //拍品id
+    @ApiModelProperty("拍品id")
     private Long lotId;
+    @ApiModelProperty("商品id")
     private Long spuId;
     //用户id
+    @ApiModelProperty("用户id")
     private Long userId;
     //订单状态
+    @ApiModelProperty("订单状态：100待支付，101待确认、103待发货、104已发货，105已完成")
     private Integer status;
     //订单金额（单位：分）
+    @ApiModelProperty("订单金额（单位：分）")
     private Long paymentAmount;
-
+    @ApiModelProperty("配送地址id")
     private Long shippingAddressId;
+    @ApiModelProperty("配送地址联系人")
     private String shippingAddressLinkname;
+    @ApiModelProperty("配送地址联系电话")
     private String shippingAddressPhone;
+    @ApiModelProperty("配送详细地址")
     private String shippingAddress;
 
     private Long expressId;
+    @ApiModelProperty("商家id")
     private Long merchantId;
     private Date createTime;
     //支付时间
+    @ApiModelProperty("支付时间")
     private Date payTime;
     //订单过期时间
+    @ApiModelProperty("订单过期时间")
     private Date expireTime;
     //支付类型
+    @ApiModelProperty("支付类型")
     private String payType;
 
 }