Merge branch 'tuancan' into develop

application/services/marketing/MarketingService.php

@@ -293,7 +293,7 @@ class MarketingService
             $where["end_time[<]"] = $now;
         }
 
-        if (!empty($params['from'])) {
+        if (!empty($params['activity_status']) && !empty($params['from'])) {
             $beforeSevenDay = date("Y-m-d H:i:s", strtotime("-7 day"));
             $where["start_time[>]"] = $beforeSevenDay;
         }