Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

5 years ago · 247bf080d2
parent c543779cb1 3c6a640a0e
commit 247bf080d2
1 changed files with 1 additions and 1 deletions
--- a/app/views/shixuns/settings.json.jbuilder
+++ b/app/views/shixuns/settings.json.jbuilder
@ -22,7 +22,7 @@ json.shixun do
  json.hide_code @shixun.hide_code # 隐藏代码窗口
  json.code_hidden @shixun.code_hidden # 代码目录隐藏
  json.vnc @shixun.vnc
-  json.exec_time @shixun.exec_time
+  #json.exec_time @shixun.exec_time
  json.webssh @shixun.webssh
  json.multi_webssh @shixun.multi_webssh
  json.use_scope @shixun.use_scope