From 0df561aa2c21423f1d4bd78040c4c3507b89e259 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 12 Apr 2021 18:11:59 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java
index e915998..af7d6a6 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java
@@ -1,11 +1,11 @@
package com.matrix.system.activity.vo;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
@Data
public class SignWriteoffVo {
@@ -39,7 +39,24 @@
private int state;
@ApiModelProperty(value ="兑奖时间")
- @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone="GMT+8")
private Date djsj;
+
+ @ApiModelProperty(value ="收货人")
+ private String consignee;
+
+ @ApiModelProperty(value ="联系电话")
+ private String consigneePhone;
+
+ @ApiModelProperty(value ="收货地址")
+ private String consigneeAddress;
+
+ @ApiModelProperty(value ="物流单号")
+ private String logisticsNum;
+
+ @ApiModelProperty(value ="物流公司")
+ private String logisticsCompany;
+
+ private List<LogisticsVo> activities;
}
--
Gitblit v1.9.1