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

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -329,7 +329,7 @@ class Fileslistitem extends Component{
                            { 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>
-											{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className=" color-grey9 task-hide fr" title={discussMessage&&discussMessage.category_name}
+											{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className="color-grey9 task-hide fr mr50" title={discussMessage&&discussMessage.category_name}
 													 style={{"max-width":"268px"}}>所属目录：{discussMessage&&discussMessage.category_name}
 											</div>:""}
 										</p>

public/react/src/modules/courses/coursesPublic/SendToFilesModal.js

@@ -211,8 +211,8 @@ class  Sendtofilesmodal extends Component{
 									return (
 										<p className="clearfix mb7" key={course.id}>
 											<Checkbox className="fl" value={course.id}  key={course.id} ></Checkbox>
-										 <div className="task-hide fl" style={{"width":'215px'}} title={course.name}>{course.name}</div>
+										 <div className="task-hide fl" style={{"width":'224px'}} title={course.name}>{course.name}</div>
-										 <div className="task-hide fl" style={{"width":'140px'}}>{moment(course.created_at).format('YYYY-MM-DD HH:mm')}</div>
+										 <div className="task-hide fl" style={{"width":'130px'}}>{moment(course.created_at).format('YYYY-MM-DD')}</div>
 										 <div className="task-hide fl" style={{"width":'110px'}}>{course.end_date}</div>
 										</p>
 									)