From 010760fd974453a70948fef465284d8c817314f5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 三月 2020 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |    3 +++
 1 files changed, 3 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 b662307..ee3d832 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -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