Merge branches '2020-05-14-order-group-书亦订单和客户数据库落地' and 'develop' of…

Merge branches '2020-05-14-order-group-书亦订单和客户数据库落地' and 'develop' of gitlab.freemud.com:order-group-application/order-group into develop

assortment-ordercenter-sdk/pom.xml

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

assortment-ordercenter-sdk/readme.md

@@ -65,3 +65,4 @@
 | 1.4.0.RELEASE | ES查询优化预约单提醒优化 | 海波 | 2020-05-11 |
 | 1.4.1.RELEASE | 返回储值卡支付订单支付金额 | 李小二 | 2020-05-11 |
 | 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
+| 1.7.1-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-14 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -405,6 +405,11 @@ public class QueryOrdersResponse {
 
             }*/
 
+            /**
+             * 配送渠道
+             */
+            private String expressChannelName;
+
 
             @NoArgsConstructor
             @Data

pom.xml

@@ -222,4 +222,17 @@
         </repository>
     </repositories>
 
+
+    <build>
+        <plugins>
+            <!-- maven 打包时跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file