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/UserSystemCouponRecord.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java
index 677f66b..a68273c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java
@@ -22,6 +22,9 @@
 	public final static int STATE_FREE_ON = 2;
 	public final static int STATE_SUCCESS = 3;
 		
+	public final static int STATE_GIVE_ON = 11; // 澧為�佷腑
+		
+	
 	
 	@Column(name = "ucr_id")
 	private Long id;

--
Gitblit v1.8.0