'修改数据统计冲突'

application/admin/controller/Report.php

@@ -95,10 +95,8 @@ class Report extends Base
         }
 
         $queueData = (new  Countmidtable())->getQueryDay($timeInterval['days_list']);
-<<<<<<< Updated upstream
-=======
+
         $defaultTime = "$startTime , $endTime";
->>>>>>> Stashed changes
 
         $this->assign([
             'xData'       => json_encode($xData),