Merge branches 'courseware', 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/courses/coursesHome/CoursesHomeCard.js

@@ -94,12 +94,12 @@ class CoursesHomeCard extends Component{
                               </Tooltip>
                               </p>
 
-                              <div className="mb15 task-hide mt10" style={{height:20}}>
+                              <div className="task-hide" style={{height:25,marginBottom:10}}>
                               {item.teacher_users.length===0?'':
                                <span className="color-grey-98" >协作老师：
                                 {item.teacher_users.map((iem,idx)=>{
                                   return(
-                                    <span className="mb15 task-hide mt10" style={{width:50,marginLeft:5}}>{idx<3?iem:''} </span> 
+                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''} </span> 
                                   )
                                 })
                                 }

public/react/src/modules/user/usersInfo/InfosCourse.js

@@ -346,7 +346,7 @@ class InfosCourse extends Component{
                     <span><img alt="用户" className="radius mt15" height="50" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="50"/></span>
                     <p className="font-14 mt10 task-hide"><span>{item.teacher && item.teacher.real_name}</span></p>
                     <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item&&item.school}</span></p>
-                    <div className="task-hide"  style={{height:20,marginBottom:10}}>
+                    <div className="task-hide"  style={{height:30 }}>
                               {item.teacher_users.length===0?'':
                                <span className="color-grey-98">协作老师：
                                 {item.teacher_users.map((iem,idx)=>{