Merge branch 'dev-fix-20210715' into 'release'

权限问题,code review:bo.dang

See merge request !31

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -376,7 +376,7 @@ export default {
         }
       }
       // this.fromType = +(this.$route.query.fromType || 1);
-      this.fromType = fromType;
+      this.fromType = + fromType;
       this.activeName =  "99";
       this.searchParam.status = '';
       this.setTable();