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 {
private int minutes_deliverNotice_third_old;
//默认的生效时间：优先加在zk的配置值 2019-2-15 0:0:0
private int defaultSellerDeliverNewOnlineTimeEx = 1550160000;
private int defaultSellerDeliverNewOnlineTimeEx = 1550127600;
@PostConstruct
private void init() {
... ...
... ... @@ -20,4 +20,4 @@ ufo.order.sellerDeliverNoticeThird = 7200
#新的发货上线时间 20190129 18:00:00
ufo.order.sellerDeliverNewOnlineTime = 1548756000
ufo.order.sellerDeliverNewOnlineTimeEx = 1550160000
\ No newline at end of file
ufo.order.sellerDeliverNewOnlineTimeEx = 1550127600
... ...