Merge remote-tracking branch 'origin/develop' into develop

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java

@@ -363,7 +363,6 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         cartGoodsList.forEach(each -> addOrUpdate(collectCartGoods, each));
         collectCartGoods.forEach(eachGoods -> {
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartConvertAdapter.convertCartGoods2DetailGoods(eachGoods, new ArrayList<>(), new HashMap<>());
-            cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
             cartGoodsDetailDto.setComboProducts(shoppingCartConvertAdapter.convertComboxGoods2DetailGoods(eachGoods,0));
             products.add(cartGoodsDetailDto);
         });