Merge remote-tracking branch 'origin/master'

mall-service/src/main/resources/bootstrap.properties

@@ -54,7 +54,6 @@ dubbo.application.qos.port=28201
 dubbo.application.qos.accept.foreign.ip=false
 dubbo.application.name=${spring.application.name}-dubbo
 dubbo.registry.group=
-dubbo.consumer.timeout=10000
 
 dubbo.reference.com.foo.BarService.check=false
 dubbo.reference.check=false