Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -172,6 +172,7 @@ class UserLoginLogic
         $info['main_lang_id'] = $project['main_lang_id'];
         $info['image_max'] = $project['image_max'];
         $info['uptime_type'] = $this->getHistory($project);
+        $info['uptime'] = $project['uptime'];
         $info['storage_type'] = $project['storage_type'];
         $info['project_location'] = $project['project_location'];
         $info['is_update_language'] = $project['is_update_language'];
@@ -261,6 +262,7 @@ class UserLoginLogic
         $info['main_lang_id'] = $project['main_lang_id'];
         $info['image_max'] = $project['image_max'];
         $info['uptime_type'] = $this->getHistory($project);
+        $info['uptime'] = $project['uptime'];
         $info['is_update_language'] = $project['is_update_language'];
         $info['configuration'] = $project['deploy_build']['configuration'];
         $info['project_type'] = $project['type'];