From c71413ad986ffef1040586d8873adee02d9a6088 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 十二月 2025 13:35:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan

---
 admin/.env.production |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/.env.production b/admin/.env.production
index 64ee400..ea17da0 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,13 +1,13 @@
 # 鐢熶骇鐜閰嶇疆
 NODE_ENV = 'production'
 
-<<<<<<< HEAD
-# VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
 
-VUE_APP_API_URL = 'http://10.49.152.112/system_gateway'
-=======
-VUE_APP_API_URL  = 'http://10.49.152.112/system_gateway'
->>>>>>> 6d07596890c54a8b7cdfd14d8ebd4b4e9acefecd
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+
+# VUE_APP_API_URL = 'http://10.49.152.112/system_gateway'
+
+# VUE_APP_API_URL  = 'http://10.49.152.112/system_gateway'
+
 
 VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
 

--
Gitblit v1.9.3