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

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/GiftSharingService.java

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

@@ -77,6 +77,7 @@ public class GiftSharingService {
     }
 
     public Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> getDiscountForGift(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult) {
+
         Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> gifts = discountResult.getGoods()
                 .stream()
                 .filter(d -> CalculationGoodsType.TYPE_1.getType().equals(d.getCartGoodType()))