Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/common/ModalWrapper.js

@@ -26,7 +26,7 @@ class ModalWrapper extends Component{
 
     return(
         <Modal
-            title={ title || "题库选用" }
+            title={ title }
             visible={visible}
             closable={false}
             width={ width || "600px" }

public/react/src/modules/courses/graduation/topics/ChooseGraduateTopicModal.js

@@ -31,6 +31,8 @@ class ChooseGraduateTopicModal extends Component{
         <ModalWrapper
           ref="modalWrapper"
           onOk={this.onOk}
+          title={ "题库选用" }
+
         >
           <React.Fragment>
             <style>{`

public/react/src/modules/courses/members/studentsList.js

@@ -503,7 +503,7 @@ class studentsList extends Component{
                   <CreateGroupByImportModal ref="createGroupByImportModal" {...this.props}></CreateGroupByImportModal>
                   <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
                 </React.Fragment> }
-              { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>新建分班</WordsBtn> }
+              { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
               { isAdmin && <WordsBtn style="blue" className="" href={`/api/courses/${courseId}/export_member_scores_excel.xlsx`}>导出成绩</WordsBtn> }

public/react/src/modules/page/main/Webssh.js

@@ -7,7 +7,7 @@ export function loadSshScript(callback) {
         prefix = ''
     } else {
         // _url_origin = `https://testeduplus2.educoder.net/`;
-			  _url_origin  = 'http://47.96.87.25:48080';
+			  _url_origin  = 'http://47.96.87.25:48080/';
     }
     const $ = window.$;
     // 未加载过