From bb0474b0368c0520f0ac12674eb8a5c2ca942170 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 29 一月 2024 09:32:13 +0800
Subject: [PATCH] Mr.Shi

---
 company/.env.development |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/company/.env.development b/company/.env.development
index 81d95d5..343c335 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -3,9 +3,14 @@
 
 # VUE_APP_API = 'http://192.168.0.104:10023/'
 
-<<<<<<< HEAD
-VUE_APP_API = 'http://192.168.0.134:10023/'
-=======
-VUE_APP_API = 'http://localhost:10023/'
+# 浼佷笟绔�-浠佸悍
+VUE_APP_API = 'http://192.168.0.134:10025/'
+
+# 骞冲彴绔�-浠佸悍
 # VUE_APP_API = 'http://192.168.0.134:10023/'
->>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153
+
+# VUE_APP_API = 'http://192.168.0.134:10023/'
+
+# VUE_APP_API = 'http://localhost:10023/'
+
+# VUE_APP_API = 'http://192.168.0.134:10023/'

--
Gitblit v1.9.3