Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/services/marketing/MarketingService.php

@@ -34,8 +34,10 @@ class MarketingService
                 "end_time[>=]" => $startTime,
             ],
         ];
+
         //已存在的活动
         $tmpMarketingList = Marketing::getMarketingList($goodsData);
+        $tmpMarketingId = [];
         if (!empty($tmpMarketingList)) {
             $tmpMarketingId = array_column($tmpMarketingList, 'marketing_id');
         }