Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.9.2.RELEASE</version>
+            <version>1.11.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.9.2.RELEASE</version>
+            <version>1.11.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>
@@ -320,7 +320,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.5.4-RELEASE</version>
+            <version>2.5.5-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>