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

# Conflicts:
#	public/react/src/modules/message/js/MessagePrivate.js

public/react/src/modules/message/js/MessagePrivate.js

@@ -4,6 +4,7 @@ import {
 	Pagination,
 } from "antd";
 import axios from 'axios';
+import moment from 'moment';
 import {getImageUrl} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
@@ -102,7 +103,7 @@ class MessagePrivate extends Component{
 			<div className="edu-back-white ml25">
       <p className="clearfix font-16 padding30-20 bor-bottom-greyE">
       <span className="fl">全部私信</span>
-      <a href="javascript:void(0);" className="color-blue fr" onClick={()=>this.okmodalsType()}>写私信</a>
+      <a  className="color-blue fr" onClick={()=>this.okmodalsType()}>写私信</a>
 			</p>
 			<Spin size="large" className="myw100baifenbi" spinning={isSpin}>
 
@@ -124,7 +125,7 @@ class MessagePrivate extends Component{
 													<a onClick={()=>this.myCome(item)} className="mr20 private_message_a">{item.target.name}</a>
 													<span>与你的私信</span>
 													<span className="color-grey-c mr20">[{item.message_count}{"条"}]</span>
-													<span className="color-grey-c">{item.send_time}</span>
+													<span className="color-grey-c">{moment(item.send_time).fromNow()}</span>
 												</p>
 												<span className="color-grey-6 break_word_firefox " 		dangerouslySetInnerHTML={{__html:item.content}}></span>