From 28f0aa9453ac157a9af5280833b0e265c57660a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 21 四月 2020 14:28:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 2 +-
1 files changed, 1 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 324e95e..428dd59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -257,7 +257,7 @@
"4c7b166fecb6d9f53837e993f2214673", "", "");
// 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
- public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-14", "yyyy-MM-dd");
+ public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-18", "yyyy-MM-dd");
// 浣跨敤濂栧姳鍒告渶澶ч噾棰濋檺鍒�
public static final BigDecimal REWARD_COUPON_LIMIT_MONEY = new BigDecimal("10");
--
Gitblit v1.8.0