Merge branch 'marketing_20210824' into test

application/services/marketing/MarketingGoodsService.php

@@ -165,8 +165,9 @@ class MarketingGoodsService
                 }
             }
         }
-
-        $result = ['result' => $list ,'last_id' => $lastId];
+        
+        $hasmore = !empty($list) ? 1 : 0 ;
+        $result = ['result' => $list ,'last_id' => $lastId, 'hasmore' => $hasmore];
         return $result;
     }