From 752d00df1ac102f3645e0c98943ae18f8b7e9c3f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 16:58:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 7 +++++--
1 files changed, 5 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 96c61cf..7b147d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -24,12 +24,12 @@
public static boolean IS_TEST = true;
- public static boolean ENABLE_MQ = false;
+ public static boolean ENABLE_MQ = true;
public static int PAGE_SIZE = 20;
// 鏂扮殑瑙勫垯鐢熸晥鏃堕棿
- public static final long NEW_ORDER_FANLI_RULE_TIME = TimeUtil.convertToTimeTemp("2020-04-30 12:00:00", "yyyy-MM-dd HH:mm:ss");
+ 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;
@@ -264,6 +264,9 @@
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