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

app/services/create_diff_record_service.rb

@@ -38,8 +38,10 @@ class CreateDiffRecordService < ApplicationService
       end
 
       content += arr.join('') if arr.present?
+      Rails.logger.info("diff_line_arr:#{arr.join('')}")
       content += line
       arr.clear
+      Rails.logger.info("diff_line:#{line}")
     end
     content
   end

app/views/stages/_stage.json.jbuilder

@@ -15,6 +15,7 @@ json.shixuns_list do
         json.shixun_name shixun.name
         json.shixun_hidden shixun.hidden
         json.identifier shixun.identifier
+        json.challenges_count shixun.challenges_count
         json.complete_status stage_myshixun_status(myshixuns.select{|ms| ms.shixun_id == shixun.id}.first)
         json.shixun_status stage_shixun_status(subject.status, shixun.status, shixun.hidden)
     end