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

@@ -46,7 +46,7 @@ public class GiftSharingService {
             , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo
             , ActivityQueryDto activityQueryDto) {
 
-        if (discountResult == null || CollectionUtils.isEmpty(discountResult.getSendGoods())) {
+        if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
             return;
         }
         String menuType = shoppingCartInfoRequestVo == null ? null : shoppingCartInfoRequestVo.getMenuType();