From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 428dd59..c6035e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -27,6 +27,9 @@
public static boolean ENABLE_MQ = false;
public static int PAGE_SIZE = 20;
+
+ // 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
+ public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-28 16:00:00", "yyyy-MM-dd HH:mm:ss");
// 楠岃瘉鏂囨湰鍙ｄ护鎴栭摼鎺id
public static Long LINK_TOKEN_VERIFY_UID = 437032L;
@@ -256,13 +259,14 @@
public static final WXAPPInfo WXMP_APP_INFO = new WXAPPInfo("wxc22f3bd53cb25012",
"4c7b166fecb6d9f53837e993f2214673", "", "");
- // 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
- 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");
+ public static final Long[] NO_UPGRADE_UIDS=new Long[]{1700696L};
+
+
// 绾跨▼绛夊緟鏁伴噺
--
Gitblit v1.8.0