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

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

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

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

@@ -2108,7 +2108,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
-        createOrderProductDemoDto.setSetClassificationName(cartGoodsDetailDto.getSetClassificationName());
+        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
         if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
             createOrderProductDemoDto.setAccounts(getMaterialAccounts(createOrderProductDemoDto, cartGoodsDetailDto));
         }