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

app/views/challenges/edit.json.jbuilder

@@ -14,7 +14,7 @@ if @tab == 0
 elsif @tab == 1
   # 评测设置的编辑模式
   json.(@challenge, :id, :path, :exec_path, :show_type, :original_picture_path, :expect_picture_path, :picture_path,
-      :web_route, :test_set_score, :test_set_average)
+      :web_route, :test_set_score, :test_set_average, :exec_time)
   json.has_web_route @shixun.has_web_route?
   json.test_sets @challenge.test_sets do |set|
     json.hidden (set.is_public ? 0 : 1)

db/migrate/20191226092304_modify_task_pass_2_for_challenges.rb

@@ -0,0 +1,8 @@
+class ModifyTaskPass2ForChallenges < ActiveRecord::Migration[5.2]
+  def change
+    challenges = Challenge.where("task_pass like '%frac%'")
+    challenges.find_each do |c|
+      c.update_column(:task_pass, c.task_pass.gsub('\f\frac', '\frac'))
+    end
+  end
+end