Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/Controller/QueryController.class.php

@@ -1671,6 +1671,7 @@ class QueryController extends BaseController
         $serverData = M('Server', 'tab_')
             ->field('server_id,server_name')
             ->where($where)
+            ->order('server_version,start_time desc')
             ->select();
         $result['status'] = 1;
         $result['data'] = $serverData;