From 938d37e96dc00f8fc3c7036d818e87d51624e0a9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Mar 2022 15:34:01 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java |    7 +++++--
 1 files changed, 5 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 f59cb27..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;
+
 	/**
 	 * 核销码
 	 */

--
Gitblit v1.9.1