Merge branches 'develop' and 'feature/20200611_未在营业时间预约单_wuping' of…

Merge branches 'develop' and 'feature/20200611_未在营业时间预约单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

order-application-service/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>2.10.5-SNAPSHOT</version>
+            <version>2.10.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>