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

# Conflicts: # .env.base
Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl
2024-07-07 12:32:17 +08:00 · 2024-06-23 17:59:13 +08:00 · 2024-06-22 10:58:10 +08:00 · 2024-06-21 13:02:07 +08:00 · 2024-06-20 12:27:25 +08:00 · 2024-06-16 21:07:09 +08:00
2 changed files with 1574 additions and 1551 deletions
--- a/.env.base
+++ b/.env.base
@@ -5,8 +5,7 @@ VITE_DEV=true
 # 请求路径
 #VITE_BASE_URL='http://118.31.23.45:48080'
-VITE_BASE_URL='http://114.55.169.15:48080'
+VITE_BASE_URL='http://localhost:48080'
 # 上传路径
 # VITE_UPLOAD_URL='http://118.31.23.45: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	ac1e748ad5	Merge remote-tracking branch 'origin/main' into dev-cl # Conflicts: # .env.base	2024-07-07 12:32:17 +08:00
caolin	1d8e9e2af9	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-06-23 17:59:13 +08:00
caolin	0895755c25	Merge remote-tracking branch 'origin/main' into dev-cl	2024-06-22 10:58:10 +08:00
caolin	32781fa067	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-06-21 13:02:07 +08:00
caolin	e33abc8f66	Merge remote-tracking branch 'origin/main' into dev-cl	2024-06-20 12:27:25 +08:00
caolin	b40e28af6f	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-06-16 21:07:09 +08:00
caolin	5ab62d2a05	Merge remote-tracking branch 'origin/main' into dev-cl	2024-06-15 14:55:14 +08:00
caolin	11fb0576ac	Merge remote-tracking branch 'origin/main' into dev-cl	2024-06-13 19:49:27 +08:00
caolin	ab30f1307f	Merge remote-tracking branch 'origin/main' into dev-cl	2024-06-06 19:00:17 +08:00
caolin	92e5a032b5	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-06-05 18:42:28 +08:00
caolin	dd6ae89728	Merge remote-tracking branch 'origin/main' into dev-cl	2024-05-30 19:38:25 +08:00
caolin	b407d0a04d	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-05-29 18:51:14 +08:00
caolin	82e7731583	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-05-27 21:31:02 +08:00
caolin	9d006fe6a5	本地启动	2024-05-25 12:51:47 +08:00
caolin	f4231a13e5	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl # Conflicts: # .env.base # vite.config.js	2024-05-25 11:55:10 +08:00
caolin	2c2ffcd104	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-05-21 20:26:37 +08:00
caolin	028883975d	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl # Conflicts: # vite.config.js	2024-05-19 23:20:51 +08:00
caolin	acc59c3a9e	本地启动	2024-05-07 00:03:52 +08:00