From ad3119f7b7e0375a8363b900346284bb1c274a3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 12:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponRecord.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 57c3f6c..677f66b 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
@@ -13,10 +13,11 @@
@Table("yeshi_ec_user_system_coupon_record")
public class UserSystemCouponRecord {
- // 鐘舵��: 鍖归厤涓�0 瑙勫垯涓嶅尮閰�1 閫�娆鹃��鍥�4 鍏嶅崟涓�2 浣跨敤鎴愬姛3
+ // 鐘舵��: 鍖归厤涓�0 瑙勫垯涓嶅尮閰�1 閫�娆鹃��鍥�4 鍖归厤瓒呮椂閫�鍥�5 鍏嶅崟涓�2 浣跨敤鎴愬姛3
public final static int STATE_WAIT= 0;
public final static int STATE_FAIL_RULE =1;
public final static int STATE_FAIL_DRAWBACK = 4;
+ public final static int STATE_WAIT_TIME_OUT = 5;
public final static int STATE_FREE_ON = 2;
public final static int STATE_SUCCESS = 3;
--
Gitblit v1.8.0