From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java |   62 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 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
new file mode 100644
index 0000000..9dea112
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java
@@ -0,0 +1,62 @@
+package com.matrix.system.activity.vo;
+
+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 {
+	
+	@ApiModelProperty(value ="奖品名称")
+	private String  jpmc;
+	
+	@ApiModelProperty(value ="奖品图片")
+	private String  jptp;
+	
+	@ApiModelProperty(value ="数量")
+	private int  sl;
+	
+	@ApiModelProperty(value ="中奖人")
+	private String  zjr;
+	
+	@ApiModelProperty(value ="中奖时间")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
+	private Date  zjsj;
+	
+	@ApiModelProperty(value ="活动名称")
+	private String  hdmc;
+	
+	@ApiModelProperty(value ="活动编号")
+	private String  hdbh;
+	
+	@ApiModelProperty(value ="兑奖方式")
+	private int  djfs;
+	
+	@ApiModelProperty(value ="兑奖状态")
+	private int  state;
+	
+	@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