From 99edd3ce8ee02b358245bff195a9f63677ef61d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 17:37:16 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 0c12c68..4952288 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -168,6 +168,11 @@
 	public static final int VIP_COUPON_REWARD_NUM = 30;
 	// vip璧犻�佸厤鍗曞埜5寮�
 	public static final int VIP_COUPON_GIVEFREE_NUM = 5;
+	// vip璧犻�侀噾甯�
+	public static final int VIP_COLDCOIN_NUM = 1800;
+	
+	// 濂栧姳鍒稿�掕鏃� - 寰呯‘瀹�
+	public static final String COUPON_REWARD_TIME = "2019-12-20"; // TODO
 	
 	
 	public static WXGZConfig wxGZConfig;

--
Gitblit v1.8.0