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

# Conflicts:
#	public/react/src/modules/courses/Index.js

public/react/src/modules/courses/Index.js

@@ -473,25 +473,25 @@ class CoursesIndex extends Component{
                      }
               ></Route>
               {/*毕设任务题库详情*/}
-              <Route path="/banks/gtopic_topics/:workid"
+              <Route path="/banks/gtask/:workid"
                      render={
                        (props) => (<Completetaskpage {...this.props} {...props} {...this.state} />)
                      }
               ></Route>
               {/*毕设内容题库详情*/}
-              <Route path="/banks/gtask_topics/:workid"
+              <Route path="/banks/gtopic/:workid"
                      render={
                        (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state} />)
                      }
               ></Route>
               {/*分组作业题库详情*/}
-              <Route path="/banks/group_topics/:workid"
+              <Route path="/banks/group/:workid"
                      render={
                        (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} />)
                      }
               ></Route>
               {/*  普通作业题库详情*/}
-              <Route path="/banks/normal_topics/:workid"
+              <Route path="/banks/normal/:workid"
                      render={
                        (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
                      }