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

Master server



查看合并请求 !1129

@@ -28,7 +28,7 @@ class RemainDay extends Command
      * @var 按上线时间统计
      * @var 按上线时间统计
      */
      */
     protected $projectId = [
     protected $projectId = [
-        1434,1812,276
+        1434,1812,276,2414
     ];//需要单独处理的项目
     ];//需要单独处理的项目
 
 
     /**
     /**

@@ -31,7 +31,7 @@ class ServersController extends BaseController
         }
         }
         $this->map['status'] = 0;
         $this->map['status'] = 0;
         $serversModel = new ServersModel();
         $serversModel = new ServersModel();
-        $lists = $serversModel->list($this->map);
+        $lists = $serversModel->list($this->map,'sort');
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }