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

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js

@@ -210,9 +210,9 @@ class TraineetraininginformationModal extends Component {
                     footer={null}
                     onCancel={this.Cancel}
                 >
-                    <div style={{width:"100%" }}className="login_register_content"  >
+                    <div style={{width:"100%" }} >
                     <div style={{"width": "100%","text-align": "left","clear": "both"}}>
-                        <div className="mt5 fl" >
+                        <div className="mt8 fl" >
                             <span style={{"text-align": "left"}}>{this.props.viewtrainingdata === undefined ? "" :  this.LimitNumber(this.props.viewtrainingdata.shixun_name)}</span>
                           <span className="ml10  "  style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.experience=== undefined?"0" :this.props.experience}/</span><span style={{"color":'#29BD8B'}}>{this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span>
                         </div>
@@ -224,7 +224,7 @@ class TraineetraininginformationModal extends Component {
                     </div>
 
                     </div>
-                    <div className=" bor-bottom-greyE mt45 "></div>
+                    {/*<div className=" bor-bottom-greyE mt45 "></div>*/}
 
                     <div style={{"clear": "both"}}>
                     <div className="fl edu-back-white ml10 ">