合并ljx

2025-08-21 17:35:47 +08:00
parent 3fe1767190 aab67593eb
commit 75f190907d
9 changed files with 1167 additions and 41 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.180:8899'
+=======
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+>>>>>>> aab67593ebb8d9116738d0d867a6119ba61615c8

 # 无人机接口地址