合并

2025-08-07 19:23:45 +08:00
parent 4a250f30f2 f37ca487f6
commit a02ef2d6b4
70 changed files with 12209 additions and 21 deletions
--- a/.env.development
+++ b/.env.development
@ -5,7 +5,11 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'

 # 开发环境
+<<<<<<< HEAD
 VITE_APP_BASE_API = 'http://192.168.110.119:8899'
+=======
+VITE_APP_BASE_API = 'http://192.168.110.119:8898'
+>>>>>>> f37ca487f6194c94e3515dc4824f5d7527a32013

 # 无人机接口地址