Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of…

Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

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

@@ -174,5 +174,5 @@ public class CreateOrderProductRequest extends BaseConfig {
     /** 商品统计分类编号**/
     private String classificationId;
 
-    private String setClassificationName;
+    private String classificationName;
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2149,7 +2149,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
-        createOrderProductDemoDto.setSetClassificationName(cartGoodsDetailDto.getSetClassificationName());
+        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
         return createOrderProductDemoDto;
     }
 

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -178,7 +178,7 @@ public class ShoppingCartGoodsDto {
         /** 商品统计分类编号**/
         private String classificationId;
 
-        private String setClassificationName;
+        private String classificationName;
         /**
          * 是否限制库存
          * 用于创建订单时，是否扣减库存