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

# Conflicts:
#	src/api/request.ts

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: b86fbf3b2fa70f004bc36f78b3b9f0f304707ddf
+  newTag: 40f342151f040d006728e6d14285447c62855c55

src/api/request.ts

@@ -2,7 +2,8 @@ import axios, { AxiosResponse } from 'axios';
 import { message } from 'antd';
 import Cookies from 'js-cookie';
 import { Base64 } from 'js-base64';
-// 项目地址
+
+// 接口地址
 const { VITE_REQUEST_BASE_URL } = import.meta.env;
 
 // 图片上传
@@ -66,7 +67,7 @@ service.interceptors.response.use(
     return Promise.reject(error);
   },
 );
-
+// 取消token
 export const generateCancelToken = () => {
   let cancel = null;
   const cancelToken = new axios.CancelToken((c) => {