Merge remote-tracking branch 'origin/dev_aliyun' into dev_tj

merge aliyun

app/controllers/homework_commons_controller.rb

@@ -294,7 +294,7 @@ class HomeworkCommonsController < ApplicationController
           HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
           normal_status("更新成功")
         else
-          normal_status("还开启挑战，暂不能更新成绩")
+          normal_status("还未开启挑战，暂不能更新成绩")
         end
       rescue Exception => e
         uid_logger(e.message)

app/views/shixun_lists/index.json.jbuilder

@@ -18,6 +18,7 @@ json.shixun_list do
     json.title highlights.delete(:name)&.join('...') || obj.searchable_title
     json.description highlights[:description]&.join('...') || Util.extract_content(obj.description)[0..300]&.gsub(atta_reg, '')
 
+    json.pic url_to_avatar(obj)
     json.content highlights
     json.level level_to_s(obj.trainee)
     json.subjects obj.subjects.uniq do |subject|