From bd25d9a8a058e8c618ee4188ed5f15a898c0f7e8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 27 一月 2024 11:43:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/company/.env.development b/company/.env.development
index ad31e4a..81d95d5 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -1,7 +1,11 @@
 # 寮�鍙戠幆澧冮厤缃�
 NODE_ENV = 'development'
 
-VUE_APP_API = 'http://192.168.0.104:10023/'
+# 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:10023/'
+>>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153

--
Gitblit v1.9.3