Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.2.5.RELEASE</version>
+    <version>1.2.6.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -20,3 +20,4 @@
 | 1.2.3.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
 | 1.2.4.RELEASE | 紧急需求 增加骑手电话 | 海波 | 2020-03-19 |
 | 1.2.5.RELEASE | 满额减配送费 | dingkai | 2020-03-26 |
+| 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
\ No newline at end of file