合并分支 'lyh-server' 到 'master'

gx数据



查看合并请求 !1450

@@ -35,7 +35,7 @@ class MonthReportController extends BaseController
         if($this->user['is_upgrade'] != 1){
         if($this->user['is_upgrade'] != 1){
             $this->map['month'] = ['>=',date('Y-m',strtotime($this->user['uptime']))];
             $this->map['month'] = ['>=',date('Y-m',strtotime($this->user['uptime']))];
         }
         }
-        $month = $monthCountModel->formatQuery($this->map)->pluck('month')->unique()->sort()->toArray();
+        $month = $monthCountModel->formatQuery($this->map)->orderBy('month', 'asc')->pluck('month')->unique()->toArray();
         $this->response('success',Code::SUCCESS,$month);
         $this->response('success',Code::SUCCESS,$month);
     }
     }