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

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

@@ -345,7 +345,7 @@ class InfosCourse extends Component{
                     </p>
                     <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="60"/></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.teacher && item.teacher.school_name}</span></p>
+                    <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item&&item.school}</span></p>
                   </div>
                   <div className="edu-txt-center course-bottom">
                     <div className="inline color-grey-6">

public/stylesheets/educoder/edu-all.css

@@ -3795,3 +3795,7 @@ a.singlepublishtwo{
 .fontweightbold{
     font-weight: bold !important;
 }
+
+.ant-drawer{
+    z-index: 10000 !important;
+}