From 552b32928f51a3b204146632785448987e0f86d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 30 Aug 2019 16:06:52 +0800
Subject: [PATCH] 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index fd6af4b29..09d4bda97 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/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} />)
                      }