From 4dfe83675fc23f4514b6c3cf44fcc84c7e0b52a8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 21 Apr 2021 10:03:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
index febff5f..e4435f5 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
@@ -66,13 +66,14 @@
 	private Date  winTime;
 	
 	/**
-	 * 状态(1:待兑换 2:待发货  3:已兑换  )
+	 * 状态(1:待兑换 2:待发货  3:已兑换 4:已失效 )
 	 */
 	private Integer  state;
 	public static final int STATE_ONE = 1;
 	public static final int STATE_TWO = 2;
 	public static final int STATE_THREE = 3;
-	
+	public static final int STATE_FOUR = 4;
+
 	/**
 	 * 中奖者ID
 	 */

--
Gitblit v1.9.1