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

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

@@ -169,7 +169,7 @@ public class GiftSharingService {
             , List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList
             , ActivityQueryDto activityQueryDto
             , String menuType) {
-        if (CollectionUtils.isEmpty(discountResult.getSendGoods())) {
+        if (CollectionUtils.isEmpty(discountResult.getGoods())) {
             return;
         }
         List<ProductBeanDTO> beanDTOList = this.drawGiftInfo(discountResult, activityQueryDto, menuType);