Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/router/RouterCommonManage.vue

@@ -343,7 +343,7 @@ export default {
 
     // 获取数据
     function getData() {
-      if (props.datasource.type == 11 || props.datasource.type == 9 || props.datasource.type == 6 || props.datasource.type == 7) {
+      if (props.datasource.type == 11 || props.datasource.type == 9 || props.datasource.type == 6 || props.datasource.type == 7 || props.datasource.type == 3) {
         // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
         console.log("我是传递的查询参数", {
           pageNo: state.currentPage,