From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java |    5 ++++-
 1 files changed, 4 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..d1732a8 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;
@@ -43,6 +45,7 @@
 	public final static String SOURCE_DAILY_REBATE = "澶╁ぉ鎶�";
 	public final static String SOURCE_EXCHANGE = "閲戝竵鍏戞崲";
 	public final static String SOURCE_GIVE = "濂藉弸璧犻��";
+	public final static String SOURCE_PULL_NEW = "鎷夋柊濂栧姳";
 	
 	@Expose
 	@Column(name = "usc_id")

--
Gitblit v1.8.0