From 925582c1f42cbb01ab7a14bb9f14093a907a657e Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 2 Aug 2019 20:02:30 +0800
Subject: [PATCH 1/2] evaluation_end

---
 public/react/src/modules/courses/busyWork/CommonWorkSetting.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 17a944d41..8baee4b45 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -722,7 +722,7 @@ class CommonWorkSetting extends Component{
       late_time: late_time ? new Date(late_time) : late_time,         // 补交截止时间
       anonymous_comment: anonymous_comment,   // true: 启用匿评 false:未启用匿评
       evaluation_start: evaluation_start ? new Date(evaluation_start) : evaluation_start, //匿评开始时间
-      evaluation_end: evaluation_end,
+      evaluation_end: evaluation_end ? new Date(evaluation_end) : evaluation_end, 
       evaluation_num: evaluation_num,     //	匿评数
       absence_penalty: absence_penalty,   // 匿评扣分
       anonymous_appeal: anonymous_appeal, // true: 启用匿评申诉, false:未启用

From aeaf0a322fdb9e10a7c1649a08ba38650cae3c0b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 2 Aug 2019 20:06:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5040acec0..7e9fd652b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -130,15 +130,15 @@ module ApplicationHelper
       if source.class.to_s == 'User'
         File.join(relative_path, ["#{source.class}", "#{source.id}"])
       else
-        File.join("avatars", ["#{source.class}", "#{source.id}"])
+        File.join("images/avatars", ["#{source.class}", "#{source.id}"])
       end
     elsif source.class.to_s == 'User'
       str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
       File.join(relative_path, "#{source.class}", str)
     elsif source.class.to_s == 'Subject'
-      File.join("educoder", "index", "subject", "subject#{rand(17)}.jpg")
+      File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg")
     elsif source.class.to_s == 'Shixun'
-      File.join("educoder","index", "shixun", "shixun#{rand(23)}.jpg")
+      File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
     end
   end