From f0ee16482d3fc34f440e2a86b901cd6e040747bf Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 17:19:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxActivityJoin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 8f4a58bd7..b72ebb366 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -46,6 +46,8 @@ public class WxActivityJoin extends BaseEntity { @Excel(name = "微信昵称", width = 10, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "nickName") private String nickName; + + @Excel(name = "生日", format = "yyyy-MM-dd", width = 10, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value = "生日", name = "birthday") private Date birthday; @@ -62,13 +64,13 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "答案", name = "answer") private String answer; - @Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "6") + @Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") private Integer signIn; - @Excel(name = "报名状态", replace = {"未确认_0", "已确认_1", "取消报名_2", "活动过期_3"}, width = 10, orderNum = "7") + @Excel(name = "报名状态", replace = {"未确认_0", "已确认_1", "取消报名_2", "活动过期_3"}, width = 10, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value = "状态0未确认-报名中1确认-报名成功2取消-报名失败3过期", name = "status") private Integer status; - @Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 10, orderNum = "5") + @Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 10, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime")