Merge branch 'test6.10.1' into test6.10.2_favorite

mali
Commit 71329c9ee08a87d84192774a7fcfd4bf1eda443c 2 parents 375ca9d5 448dfab6
Showing 2 changed files with 2 additions and 3 deletions
order/src/main/java/com/yohoufo/order/service/proxy/FastDeliveryProxyService.java
web/src/main/webapp/META-INF/autoconf/config.properties
--- a/order/src/main/java/com/yohoufo/order/service/proxy/FastDeliveryProxyService.java
View file @71329c9
+++ b/order/src/main/java/com/yohoufo/order/service/proxy/FastDeliveryProxyService.java
View file @71329c9
@@ -31,8 +31,7 @@ public class FastDeliveryProxyService {
 
     public static final String YH_SECRET = "yh_2019oEngMex8";
 
-     @Value("${fast.delivery.timetout:1000}")
-     int Default_Time;
+     int Default_Time=1000;
 
     @Autowired
     FastDeliveryTemplate fastDeliveryTemplate;
--- a/web/src/main/webapp/META-INF/autoconf/config.properties
View file @71329c9
+++ b/web/src/main/webapp/META-INF/autoconf/config.properties
View file @71329c9
@@ -125,7 +125,7 @@ ufo.product.addSizeSortId=40
 ufo.certification.timesLimit=3
 
 
- fast.delivery.timetout=${fast.delivery.timetout}
+ 
 
 unionpay.env=00
 unionpay.notifyurl=${unionpay.notifyurl}