From 831cafdd72242d89fcc1f5e447c919a31e129f51 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 一月 2024 17:43:43 +0800
Subject: [PATCH] 开发业务接口

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

diff --git a/company/.env.development b/company/.env.development
index 81d95d5..11666cc 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -3,9 +3,6 @@
 
 # VUE_APP_API = 'http://192.168.0.104:10023/'
 
-<<<<<<< HEAD
-VUE_APP_API = 'http://192.168.0.134:10023/'
-=======
+#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