From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
index a424461..d9cff53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
@@ -24,7 +24,9 @@
 	public final static int STATE_END_USE = 3;
 	// 宸茶繃鏈�4 
 	public final static int STATE_OVERDUE = 4;
-	
+	// 浣跨敤閫�鍥� -涓嶅叆搴�
+	public final static int STATE_BACK = 5;
+		
 	
 	// 鍙娇鐢ㄣ�佸彲璧犻�侊紙杩斿洖鍓嶇瀛楁锛�
 	public final static int STATE_USE_GIVE = 10;

--
Gitblit v1.8.0