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

Merge remote-tracking branch 'origin/main' into dev-cl
# Conflicts: # .env.base
2 changed files with 1566 additions and 1557 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://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/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
caolin	fa2a0818da	Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-manage-web into dev-cl	3 weeks ago
caolin	1039122a2b	Merge remote-tracking branch 'origin/main' into dev-cl # Conflicts: # .env.base	1 month ago
caolin	1a1fc0fbf9	1	1 month ago