Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

# Conflicts:
#	src/router/routes/basic.ts

src/utils/file/download.ts

@@ -1,5 +1,6 @@
 import { openWindow } from '..';
 import { dataURLtoBlob, urlToBase64 } from './base64Conver';
+import { defHttp } from '/@/utils/http/axios';
 
 /**
  * Download online pictures
@@ -71,7 +72,6 @@ export function downloadByUrl({
     let fileUrl = window.URL.createObjectURL(x.response);
     const isChrome = window.navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
     const isSafari = window.navigator.userAgent.toLowerCase().indexOf('safari') > -1;
-
     if (/(iP)/g.test(window.navigator.userAgent)) {
       console.error('Your browser does not support download!');
       return false;

src/utils/http/axios/index.ts

@@ -26,7 +26,6 @@ import useGlobalFlag from '/@/hooks/core/useGlobalFlag';
 
 import { useLockStore } from '/@/store/modules/lock';
 
-
 const globSetting = useGlobSetting();
 const urlPrefix = globSetting.urlPrefix;
 const { createMessage, createErrorModal } = useMessage();