From b6b5fea50e8f8773c0f266241fcd6b77d37e01fe Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Thu, 03 Jun 2021 15:04:51 +0800
Subject: [PATCH] 业绩规则1

---
 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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 7ab47e4..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
 	 */
@@ -85,7 +86,7 @@
 	 */
 
 
-	private Long  logisticsId;
+	private Integer  logisticsId;
 	
 	/**
 	 * 中奖记录ID
@@ -114,8 +115,6 @@
 
 
 	private Long  writeoffUserid;
-
-
 
   
 }
\ No newline at end of file

--
Gitblit v1.9.1