'fix:合并分支冲突'

src/common/js/axios.ts

@@ -130,7 +130,9 @@ class Axios {
       if (method === 'GET') {
         config = Object.assign({ params, url: `${BASIC_HOST}${_url}`, method });
       } else {
+        console.log(corpType)
         config = Object.assign({ data: { corpType, ...(params || {}) }, url: `${BASIC_HOST}${_url}`, method });
+        console.log(config,'config')
       }
 
       instance(config).then((res: AxiosResponse): void => {

src/modules/root/WechatLogin.tsx

@@ -2,7 +2,8 @@ import React, { useState, useRef, useEffect } from 'react';
 import qrcode from '@/libs/qrcode/qrcode.js';
 import Service from '@/common/js/service';
 import User from '@/common/js/user';
-import { PATH, corpType } from '@/domains/basic-domain/constants';
+import { PATH } from '@/domains/basic-domain/constants';
+import { corpType } from '@/domains/brand/constants'
 import './WechatLogin.less';
 import { brandName, BRAND, brandIcon, brandLogo } from '@/domains/brand/constants'
 declare var location: any;