From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 73de2f1..ee3d832 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -173,7 +173,7 @@
 	public static final int TLJ_NEW_USER_DEFINE = 10;
 
 	// vip濂栧姳鍒稿埜5寮�
-	public static final int VIP_COUPON_REWARD_NUM = 30;
+	public static final int VIP_COUPON_REWARD_NUM = 15;
 	// vip璧犻�佸厤鍗曞埜5寮�
 	public static final int VIP_COUPON_GIVEFREE_NUM = 5;
 	// vip璧犻�侀噾甯�
@@ -201,6 +201,9 @@
 	public static final int VIP_PROCESS_3_TEAM_SECOND = 64;
 	 
 		
+	// 璁㈠崟鍒楄〃鏄�> 鏃堕棿 TODO
+	public static final String ORDER_SHOW_BRACE_TIME = "2019-12-14";
+		
 
 	// 濂栧姳鍒稿�掕鏃� - 澶╂暟
 	public static final int COUPON_REWARD_LIMIT_DAY = 5;

--
Gitblit v1.8.0