合并分支 'zhl' 到 'master'

'time'



查看合并请求 !2851

@@ -790,7 +790,7 @@ class ProjectController extends BaseController
         $order_by_field =  $request->input('order_by_field', 'id');
         $order_by_field =  $request->input('order_by_field', 'id');
         $order_by_sort =  $request->input('order_by_sort', 'desc');
         $order_by_sort =  $request->input('order_by_sort', 'desc');
         $start_time = $this->param['start_time'] ?? '';
         $start_time = $this->param['start_time'] ?? '';
-        $end_time = $this->param['end'] ?? '';
+        $end_time = $this->param['end_time'] ?? '';
 
 
         if(!$source_id && !$id){
         if(!$source_id && !$id){
             $this->response('参数异常',Code::SYSTEM_ERROR);
             $this->response('参数异常',Code::SYSTEM_ERROR);