~jiangyouyao/beauty-erp.git

			@@ -1,15 +1,20 @@
			package com.matrix.system.shopXcx.api.vo;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.matrix.system.shopXcx.bean.ShopLogisticsInfo;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import java.util.Date;
			import java.util.List;

			@Data
			@ApiModel(value = "SeeAwardTextVo", description = "劵码信息")
			public class SeeAwardTextVo {

			@ApiModelProperty(value ="中奖记录ID")
			private long id;

			@ApiModelProperty(value ="奖项名称")
			private String awardName;
			@@ -43,7 +48,29 @@
			@ApiModelProperty(value ="客服微信")
			private String wechatImg;

			@ApiModelProperty(value =" 是否已领取（1：待领取2:已领取）")
			@ApiModelProperty(value ="客服电话")
			private String customerPhone ;

			@ApiModelProperty(value =" 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）")
			private Integer state;

			/**
			* 收货人
			*/
			@ApiModelProperty(value ="收货人")
			private String consignee;
			/**
			* 联系电话
			*/
			@ApiModelProperty(value ="联系电话")
			private String consigneePhone;
			/**
			* 收货地址
			*/
			@ApiModelProperty(value =" 收货地址")
			private String consigneeAddress;

			@ApiModelProperty(value ="物流信息记录")
			private List<ShopLogisticsInfo> shopLogisticsInfos;

			}