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

# Conflicts:
#	.env
#	.env.production
dev
wangpeng 2024-04-12 11:21:59 +08:00
commit 9eab7f33e8
1 changed files with 1 additions and 1 deletions

2
env.d.ts vendored
View File

@ -7,7 +7,7 @@ interface ImportMetaEnv {
/**
* undefined
*/
readonly VITE_PROXY: Record<string, any>
readonly VITE_PROXY: string
/**
* undefined
*/