From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
index 4782536..07a2563 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
@@ -51,7 +51,7 @@
 	private Long  awardId;
 	
 	/**
-	 * 是否已领取（1：待领取2:已领取）
+	 * 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）
 	 */
 
 
@@ -59,7 +59,10 @@
 
 	public static final int STATE_ING = 1;
 	public static final int STATE_DONE = 2;
-	
+	public static final int STATE_THREE = 3;
+	public static final int STATE_FOUR = 4;
+	public static final int STATE_FIVE = 5;
+
 	/**
 	 * 核销码
 	 */
@@ -81,6 +84,19 @@
 
 	private Long  companyId;
 
+	/**
+	 * 收货人
+	 */
+	private String  consignee;
+	/**
+	 * 联系电话
+	 */
+	private String  consigneePhone;
+	/**
+	 * 收货地址
+	 */
+	private String  consigneeAddress;
+
 
 
   

--
Gitblit v1.9.1