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

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -315,6 +315,7 @@ public class ShoppingCartAdapter {
                         updateComboxGoodsInfoNew(productGroup, spuProduct, false);
                     }
                 }
+                cartGoods.setGoodsType(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
             }
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>2.0.4-SNAPSHOT</version>
+            <version>2.0.49-SNAPSHOT</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>