Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

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

@@ -195,7 +195,7 @@ public class CalculationSharingDiscountService {
             for (CartGoods.ComboxGoods boxes : cartGoods.getProductComboList()) {
                 CalculationSharingDiscountRequestDto.CalculationDiscountGoods.GroupCombox combo = new CalculationSharingDiscountRequestDto.CalculationDiscountGoods.GroupCombox();
                 combo.setGoodsId(boxes.getGoodsId());
-                combo.setGoodsQuantity(1);
+                combo.setGoodsQuantity(boxes.getQty());
                 combo.setOriginalPrice(boxes.getOriginalPrice().intValue());
                 groupBoxes.add(combo);
             }