Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-07-12 c562fa2e66f4972ae23fa57ef7412da6e18991ed

 src/api/sgyhpczl/majorHidden.js

@@ -1,5 +1,5 @@
import request from '@/utils/request';
import {getTokenAndVerify,getUsernameAndPassword} from "@/api/sgyhpczl/auth";
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";


export function getPageList(data) {
@@ -79,8 +79,6 @@
        headers:{
            'token': getTokenAndVerify().token,
            'verify':getTokenAndVerify().verify,
            'username': getUsernameAndPassword.username,
            'password':getUsernameAndPassword().password
        },
        url: "/taboi/danger/major_list",
        contentType: "application/json",