sunyu::update::fix conflicts about productGroup add material

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

@@ -724,12 +724,12 @@ public class ShoppingCartConvertAdapter {
         //2020/12/10  套餐内可选商品加料
         if(CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())){
             if (CollectionUtils.isNotEmpty(parentProductBean.getAdditionalGroupList())) {
-                List<ProductBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
-                for (ProductBeanDTO.ProductGroupType productGroupType : parentProductBean.getAdditionalGroupList()){
+                List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
+                for (ProductTypeBeanDTO.ProductGroupType productGroupType : parentProductBean.getAdditionalGroupList()){
                     groupDetail.addAll(productGroupType.getGroupDetail());
                 }
                 for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()){
-                    for (ProductBeanDTO.ProductGroupType.GroupDetailType detailType : groupDetail){
+                    for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType detailType : groupDetail){
                         if(detailType.getProductId().equals(productMaterial.getSpuId())){
                             productMaterial.setSpuId(detailType.getProductId());
                             productMaterial.setAmount(detailType.getProductFinalPrice().longValue());