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

app/views/courses/search_teacher_candidate.json.jbuilder

@@ -3,6 +3,7 @@ json.candidates do
     json.id user.id
     json.name user.real_name
     json.nickname user.nickname
+    json.login user.login
     json.school_name user.user_extension.school.try(:name)
     json.school_id user.user_extension.school.try(:id)
     json.added @course.course_member?(user.id, [1, 2, 3])

public/react/src/modules/courses/members/modal/AddTeacherModal.js

@@ -205,7 +205,7 @@ class AddTeacherModal extends Component{
         {`
         .demo-loading-container {
           position: absolute;
-          bottom: 93px;
+          bottom: 210px;
           width: 82%;
           text-align: center;
         }