Merge branch '20200806-10000' of…

Merge branch '20200806-10000' of gitlab.freemud.com:order-group-application/order-group into develop

# Conflicts:
#	order-application-service/pom.xml

order-application-service/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
-            <version>1.3.9-SNAPSHOT</version>
+            <version>1.5.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
@@ -321,7 +321,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>