Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -29,7 +29,7 @@ class PackDirController extends BaseController
             $serverModel = new Servers();
             $serverModel = new Servers();
             $domainModel = new DomainInfo();
             $domainModel = new DomainInfo();
             foreach ($lists['list'] as $k => $v) {
             foreach ($lists['list'] as $k => $v) {
-                $lists['list'][$k]['operator_name'] = $manageModel->getName($v['user_id']);
+                $lists['list'][$k]['operator_name'] = $v['user_id'] ? $manageModel->getName($v['user_id']) : '系统';
                 $lists['list'][$k]['project_name'] = $projectModel->getProjectName($v['project_id']);
                 $lists['list'][$k]['project_name'] = $projectModel->getProjectName($v['project_id']);
 
 
                 $download_url = '';
                 $download_url = '';

@@ -23,6 +23,7 @@ class AutoPullNotify extends Base
             8 => '香港服务器',
             8 => '香港服务器',
             17 => '解析IP专用服务器',
             17 => '解析IP专用服务器',
             22 => '白帽专属服务器01',
             22 => '白帽专属服务器01',
+            24 => '白帽专属服务器02',
             23 => '西班牙服务器',
             23 => '西班牙服务器',
         ];
         ];
     }
     }