From 3f17d6e1b92255d03f96948a5d5c1d44720e5115 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 3 Dec 2019 16:50:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=9A=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index f243fb182..1c6b606e5 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/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)

From 4c62e891ff2dba8a37ddc646b123463ed71ae1f9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 3 Dec 2019 17:18:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=89=E7=94=A8=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixun_lists/index.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/shixun_lists/index.json.jbuilder b/app/views/shixun_lists/index.json.jbuilder
index 08baeabf9..e926ee927 100644
--- a/app/views/shixun_lists/index.json.jbuilder
+++ b/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|