From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java
index 42f849c..8378bd8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoV2.java
@@ -26,7 +26,7 @@
 	public final static int STATE_YILINGQU = 3;
 	public final static int STATE_SHIXIAO = 4;
 	
-	// 5-閮ㄥ垎澶辨晥
+	// 5-閮ㄥ垎澶辨晥(杩斿洖瀹㈡埛绔樉绀虹敤锛屼笉鐢ㄤ綔閫昏緫澶勭悊)
 	public final static int STATE_BUFENSHIXIAO = 5;
 
 	// 鑷喘绾㈠寘  鑰佺増 2灞炰簬鑷喘
@@ -36,6 +36,9 @@
 	// 鏂颁汉绾㈠寘
 	public final static int TYPE_XINREN = 4;
 	
+	// 浣跨敤鍒哥孩鍖�
+	public final static int TYPE_COUPON = 10;
+	
 
 	public final static int TYPE_YAOQING = 5;
 	// 涓�绾у垎閿�绾㈠寘

--
Gitblit v1.8.0