Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of…

Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -116,6 +116,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setUnit(cartGoods.getUnit());
         cartGoodsDetailDto.setActivityDiscountsDtos(new ArrayList<>());
         cartGoodsDetailDto.setTotalDiscountAmount(0);
+        cartGoodsDetailDto.setSpecialExtra(cartGoods.getSpecialExtra());
         cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
         cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
         if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {