Merge branches 'dev_aliyun', 'dev_ysmnewshixun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysmnewshixun

5 years ago · f142fcc335
parent 94263caead a1d7942a66
commit f142fcc335
1 changed files with 1 additions and 1 deletions
--- a/app/helpers/export_helper.rb
+++ b/app/helpers/export_helper.rb
@ -483,7 +483,7 @@ module ExportHelper
          w_14 = nil
        end
        w_15 = w.work_score.nil? ? "--" : w.work_score.round(1)
-        w_16 = w.update_time ? format_time(w.update_time) : "--"  "更新时间"
+        w_16 = w.update_time ? format_time(w.update_time) : "--"
        myshixun_complete = myshixun && myshixun.status == 1
        w_17 = myshixun_complete && w.cost_time ? (game_spend_time w.cost_time) : "未完成"
        teacher_comment = w.shixun_work_comments.select{|comment| comment.challenge_id == 0}.first