From c044b6dd024b6884a4f39bc56e4873c95b13fe02 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 八月 2019 11:59:00 +0800
Subject: [PATCH] 免单更改

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 8166dd1..0c52fff 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
@@ -16,11 +16,24 @@
 @Table("yeshi_ec_user_system_coupon")
 public class UserSystemCoupon {
 
-	// 鐘舵��:鏈娇鐢�1銆佷娇鐢ㄤ腑2銆佸凡浣跨敤3銆佸凡杩囨湡4
+	// 鏈娇鐢�1
 	public final static int STATE_CAN_USE = 1;
+	// 浣跨敤涓�2
 	public final static int STATE_IN_USE = 2;
+	// 宸蹭娇鐢�3
 	public final static int STATE_END_USE = 3;
+	// 宸茶繃鏈�4 
 	public final static int STATE_OVERDUE = 4;
+	
+	
+	// 鍙娇鐢ㄣ�佸彲璧犻�侊紙杩斿洖鍓嶇瀛楁锛�
+	public final static int STATE_USE_GIVE = 10;
+	// 鍙彲璧犻�侊紙杩斿洖鍓嶇瀛楁锛�
+	public final static int STATE_GIVE_ONLY = 11; 
+	// 璧犻�佷腑锛堣繑鍥炲墠绔瓧娈碉級
+	public final static int STATE_GIVE_IN = 12;
+	// 璧犻�佹垚鍔燂紙杩斿洖鍓嶇瀛楁锛�
+	public final static int STATE_GIVE_END = 13;
 	
 	
 	// 鏉ユ簮: 鏂颁汉鎶藉銆侀個璇峰鍔�
@@ -58,8 +71,7 @@
 	@Column(name = "usc_state_activate")
 	private Integer stateActivated;
 	
-	// 鏄惁鍙禒閫�
-	@Expose
+	// 鏄惁宸茶禒閫�
 	@Column(name = "usc_give")
 	private Boolean give;
 	

--
Gitblit v1.8.0