Commit 4290f108 by yuananting

fix:解决冲突

parent 184fea4f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-04-29 10:26:32 * @Date: 2020-04-29 10:26:32
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-04-15 21:55:03 * @LastEditTime: 2021-04-15 21:55:50
* @Description: 内容线路由配置 * @Description: 内容线路由配置
*/ */
import Home from '@/modules/home/Home'; import Home from '@/modules/home/Home';
...@@ -32,6 +32,7 @@ import QuestionManageIndex from '@/modules/teach-tool/question-manage/Index'; ...@@ -32,6 +32,7 @@ import QuestionManageIndex from '@/modules/teach-tool/question-manage/Index';
import PaperManageIndex from '@/modules/teach-tool/paper-manage/Index'; import PaperManageIndex from '@/modules/teach-tool/paper-manage/Index';
import ExaminationManagerIndex from '@/modules/teach-tool/examination-manager/Index'; import ExaminationManagerIndex from '@/modules/teach-tool/examination-manager/Index';
import KnowledgeBase from "@/modules/knowledge-base/index"; import KnowledgeBase from "@/modules/knowledge-base/index";
import CollegeInfoPage from '@/modules/college-manage/CollegeInfoPage';
const mainRoutes = [ const mainRoutes = [
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment