周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 5970a0d63eb6c3211a0e755de56842c63841cf17 2 个父辈 4b790b3e 726536bf

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

内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 0 行删除
@@ -172,6 +172,7 @@ class UserLoginLogic @@ -172,6 +172,7 @@ class UserLoginLogic
172 $info['main_lang_id'] = $project['main_lang_id']; 172 $info['main_lang_id'] = $project['main_lang_id'];
173 $info['image_max'] = $project['image_max']; 173 $info['image_max'] = $project['image_max'];
174 $info['uptime_type'] = $this->getHistory($project); 174 $info['uptime_type'] = $this->getHistory($project);
  175 + $info['uptime'] = $project['uptime'];
175 $info['storage_type'] = $project['storage_type']; 176 $info['storage_type'] = $project['storage_type'];
176 $info['project_location'] = $project['project_location']; 177 $info['project_location'] = $project['project_location'];
177 $info['is_update_language'] = $project['is_update_language']; 178 $info['is_update_language'] = $project['is_update_language'];
@@ -261,6 +262,7 @@ class UserLoginLogic @@ -261,6 +262,7 @@ class UserLoginLogic
261 $info['main_lang_id'] = $project['main_lang_id']; 262 $info['main_lang_id'] = $project['main_lang_id'];
262 $info['image_max'] = $project['image_max']; 263 $info['image_max'] = $project['image_max'];
263 $info['uptime_type'] = $this->getHistory($project); 264 $info['uptime_type'] = $this->getHistory($project);
  265 + $info['uptime'] = $project['uptime'];
264 $info['is_update_language'] = $project['is_update_language']; 266 $info['is_update_language'] = $project['is_update_language'];
265 $info['configuration'] = $project['deploy_build']['configuration']; 267 $info['configuration'] = $project['deploy_build']['configuration'];
266 $info['project_type'] = $project['type']; 268 $info['project_type'] = $project['type'];