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

app/controllers/student_works_controller.rb

@@ -429,7 +429,7 @@ class StudentWorksController < ApplicationController
   def shixun_work_report
     @user = @work.user
     @shixun = @homework.shixuns.take
-    @games = @work.myshixun.games.includes(:challenge) if @work.myshixun
+    @games = @work.myshixun.games.includes(:challenge, :game_codes, :outputs) if @work.myshixun
 
     # 用户最大评测次数
     @user_evaluate_count = @games.sum(:evaluate_count) if @games
@@ -440,7 +440,7 @@ class StudentWorksController < ApplicationController
   def export_shixun_work_report
     @user = @work.user
     @shixun = @homework.shixuns.take
-    @games = @work.myshixun.games.includes(:challenge, :game_codes) if @work.myshixun
+    @games = @work.myshixun.games.includes(:challenge, :game_codes, :outputs) if @work.myshixun
 
     # 用户最大评测次数
     @user_evaluate_count = @games.sum(:evaluate_count) if @games