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

2 changed files with 1565 additions and 1556 deletions
--- a/.env.base
+++ b/.env.base
@ -4,14 +4,14 @@ 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_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
+ VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 # VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'

 # 接口前缀
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
caolin	0382424440	Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-tiku-manage-web into dev-cl	1 week ago
caolin	7e04aface2	Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-tiku-manage-web into dev-cl	2 weeks ago
caolin	4d9aebc9e3	Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-tiku-manage-web into dev-cl	4 weeks ago
caolin	996288c808	1	4 weeks ago
caolin	29cf5bbeaf	Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-tiku-manage-web into dev-cl	1 month ago
caolin	64c0728c34	1	1 month ago