Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-oa-manage-web into dev-cl

# Conflicts: # .env.base
2 changed files with 4 additions and 2 deletions
--- a/.env.base
+++ b/.env.base
@ -4,11 +4,11 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 # 请求路径
-# VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://47.98.161.246:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
-VITE_BASE_URL='http://114.215.207.150:48080'
+#VITE_BASE_URL='http://114.215.207.150:48080'
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
--- a/.env.dev
+++ b/.env.dev
@ -4,8 +4,10 @@ VITE_NODE_ENV=production
 VITE_DEV=false
 # 请求路径
 #VITE_BASE_URL='http://47.98.161.246:48080'
 VITE_BASE_URL='http://localhost:48080'
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
Author	SHA1	Message	Date
caolin	b05e42f9c7	Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-oa-manage-web into dev-cl	4 weeks ago
caolin	6d08fd8390	Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-oa-manage-web into dev-cl # Conflicts: # .env.base	1 month ago
caolin	1413ce44c7	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl # Conflicts: # .env.base	2 months ago
caolin	5d88d06707	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl	2 months ago
caolin	f0afdcf18e	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl	3 months ago
caolin	b019400409	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl	3 months ago
caolin	69a496dc6e	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl	3 months ago
caolin	7c7bf51518	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl # Conflicts: # .env.base # yarn.lock	3 months ago
caolin	65dae80239	1	3 months ago