Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

# Conflicts:
#	src/views/system/user/profile/round-select.vue

src/router/index.js

@@ -783,7 +783,7 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/elective/report/index'], resolve),
         name: 'ElectiveReportIndex',
         meta: {
-          title: '报告示例'
+          title: '选科报告'
         }
       }
     ]