sunyu::update::fix bug about code conflicts

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

@@ -1562,7 +1562,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                             }
                             if (PRODUCT_GROUP_PRICE_CHANGE == validaProduct.getCode()) {
                                 changePriceSpu.add(spuName);
-                                List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
+                                List<ProductTypeBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartConvertAdapter.updateCartGoodsInfoForMCoffee(cartGoods, productList);
                             }
                             if (PRODUCT_GROUP_EMPTY == validaProduct.getCode()) {