From c96ad91ac10fe0737ee62bbc15859ad3f335b8c8 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 15:40:18 +0800
Subject: [PATCH] HH

---
 public/react/src/modules/courses/Resource/Fileslistitem.js  | 4 ++--
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index a20dcf9c3..afcdf35f4 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -271,7 +271,7 @@ class Fileslistitem extends Component{
                     return(
                       <div className="mr50">
                         <span className="mr15 color-dark">{item.course_group_name}</span>
-                        <span className="mr15 color-grey9 ">将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD hh:mm')}</span>
+                        <span className="mr15 color-grey9 ">将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD HH:mm')}</span>
                       </div>
                     )
                     })}
@@ -289,7 +289,7 @@ class Fileslistitem extends Component{
                             {/*{moment(discussMessage.publish_time).fromNow()}*/}
                           { discussMessage.publish_time===null?"":
                             discussMessage.is_publish===true?"":"发布于"}
-                           { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD hh:mm')}
+                           { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
                         </span>
                       </span>
 											{this.props.isAdmin ||this.props.current_user.login===discussMessage.author.login?
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index b1a1d5553..251e39fcb 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -190,7 +190,7 @@ function buildColumns(that, student_works) {
 
     render: (update_time, record) => (
       <span>
-        <a href="javascript:;"  style={{color:'#989898'}}>{update_time ? moment(update_time).format('YYYY-MM-DD hh:mm') : '--'}</a>
+        <a href="javascript:;"  style={{color:'#989898'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
     </span>
     ),
   }])