Merge branch 'feature/20201229_xukang_麦咖啡p5v1' into develop

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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -173,7 +173,7 @@ public class CreateOrderProductRequest extends BaseConfig {
     private String category;
 
     /** 商品税率**/
-    private Double tax;
+    private double tax;
 
     private String taxId;
 

order-application-service/pom.xml

@@ -26,6 +26,12 @@
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-orderdistributor-sdk</artifactId>
             <version>2.4.4-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>cn.freemud</groupId>
+                    <artifactId>ordercenter-sdk</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>