ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit a8f199c36c8421ecfc67c0ff4b7d40697ea9e919 2 parents 275a1f2a 099644c1

Merge branch 'master' into test6.8.6 

Conflicts:
	web/src/main/resources/global.properties
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -49,7 +49,7 @@ public class DeliveryMinutesService { @@ -49,7 +49,7 @@ public class DeliveryMinutesService {
49 private int minutes_deliverNotice_third_old; 49 private int minutes_deliverNotice_third_old;
50 50
51 //默认的生效时间：优先加在zk的配置值 2019-2-15 0:0:0 51 //默认的生效时间：优先加在zk的配置值 2019-2-15 0:0:0
52 - private int defaultSellerDeliverNewOnlineTimeEx = 1550160000; 52 + private int defaultSellerDeliverNewOnlineTimeEx = 1550127600;
53 53
54 @PostConstruct 54 @PostConstruct
55 private void init() { 55 private void init() {
@@ -20,4 +20,4 @@ ufo.order.sellerDeliverNoticeThird = 7200 @@ -20,4 +20,4 @@ ufo.order.sellerDeliverNoticeThird = 7200
20 #新的发货上线时间 20190129 18:00:00 20 #新的发货上线时间 20190129 18:00:00
21 ufo.order.sellerDeliverNewOnlineTime = 1548756000 21 ufo.order.sellerDeliverNewOnlineTime = 1548756000
22 22
23 -ufo.order.sellerDeliverNewOnlineTimeEx = 1550160000  
  23 +ufo.order.sellerDeliverNewOnlineTimeEx = 1550127600