update:master fix

application/services/marketing/MarketingGoodsService.php

@@ -70,6 +70,9 @@ class MarketingGoodsService
 			"online_status" => 1,
     	];
     	$marketingList = Marketing::getMarketingList($marketingWhere);
+        $list = [];
+        $lastId = "";
+    	if (!empty($marketingList)) {
             $marketingId = array_column($marketingList, 'marketing_id');
             $where['marketing_id'] = !empty($marketingId) ? $marketingId : [];
             $data = MarketingGoods::marketingGoodsList($where);
@@ -97,7 +100,6 @@ class MarketingGoodsService
 
             $lifeAccountList = CommonService::getlifeAccountList(['life_account_id' => $lifeAccountId]);
 
-        $list = [];
             $i = 0;
             foreach ($data as $key => $value) {
 
@@ -160,8 +162,7 @@ class MarketingGoodsService
                     $list[$i]['goods_share_code'] = $goodsShareId;
                     $i++;
                 }
-
-            
+            }
         }
 
         $result = ['result' => $list ,'last_id' => $lastId];