Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of…

Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

order-application-service/pom.xml

@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.7.3.RELEASE</version>
+            <version>2.7.4.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>

order-management/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.7.3.RELEASE</version>
+            <version>2.7.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>