Merge remote-tracking branch 'origin/develop' into develop

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.6-SNAPSHOT</version>
+    <version>2.1.7-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -91,4 +91,5 @@
 | 2.0.22-SNAPSHOT| 麦咖啡自提预约单入机提前五分钟 | 徐康 | 2020-11-04 |
 | 2.0.24-SNAPSHOT| 农工商添加设备号 | 梁崇福 | 2020-11-09 |
 | 2.1.3-SNAPSHOT| redis工具类添加解锁方法 | 刘鹏飞 | 2020-11-10 |
-| 2.1.6-SNAPSHOT| 升级ordercenter-sdk   | lixixoaer | 2020-11-10 |
\ No newline at end of file
+| 2.1.6-SNAPSHOT| 升级ordercenter-sdk   | lixixoaer | 2020-11-10 |
+| 2.1.7-SNAPSHOT|  混合支付退款   | lixixoaer | 2020-11-11 |
\ No newline at end of file

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.6-SNAPSHOT</version>
+            <version>2.1.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-management/pom.xml

@@ -177,6 +177,12 @@
             <version>2.7.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.freemud</groupId>
+            <artifactId>assortment-ordercenter-sdk</artifactId>
+            <version>2.1.7-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>