Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa

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

@@ -980,8 +980,8 @@ public class ShoppingCartConvertAdapter {
                             }
                         }else {
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productGroup.getSpuId());
-                                updateComboxGoodsInfoForMCoffee(productGroup, productBeanDTO, false);
+//                                ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(productGroup.getSpuId());
+                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
                             }
                         }
                     }