From c1a252466c1098ad5a9421664d12c328793a9020 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 09:59:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=AF=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8D=A1=E5=AF=86=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxCouponPassword.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index f7f52952d..ff10e70b5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -14,8 +14,9 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) public class WxCouponPassword extends BaseEntity { - + @Id + @Excel(name = "ID", width = 20, orderNum = "1") protected Long id; @Transient @@ -27,13 +28,13 @@ public class WxCouponPassword extends BaseEntity { private Long couponId; @io.swagger.annotations.ApiModelProperty(value="卡券短ID",name="couponShort") private String couponShort; - @Excel(name = "兑换码", width = 20, orderNum = "1") + @Excel(name = "兑换码", width = 20, orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="商户名称",name="password") private String password; - @Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "3") + @Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用4已过期",name="status") private Integer status; - @Excel(name = "发送手机", width = 20, orderNum = "4") + @Excel(name = "发送手机", width = 20, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone") private String sendedPhone; @io.swagger.annotations.ApiModelProperty(value="卡包ID(coupon_order_id/card_id)",name="cardId") @@ -42,7 +43,7 @@ public class WxCouponPassword extends BaseEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - @Excel(name="过期时间",width = 20,format="yyyy-MM-dd", orderNum = "2") + @Excel(name="过期时间",width = 20,format="yyyy-MM-dd", orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="过期时间",name="expireDate") private Date expireDate;