From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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..9dea112 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 {
@@ -41,5 +41,22 @@
@ApiModelProperty(value ="兑奖时间")
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", 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