From 6fb7d1967c39725b083c9cfad154a99b89749c77 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 十月 2023 21:00:27 +0800
Subject: [PATCH] bug修复

---
 company_admin/.env.development |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/company_admin/.env.development b/company_admin/.env.development
index 02e8212..ea6e028 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -3,11 +3,8 @@
 
 # VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
 
-<<<<<<< HEAD
-VUE_APP_API = 'http://192.168.0.35:10022/'
-=======
-# VUE_APP_API = 'http://192.168.0.15:10024/'
->>>>>>> 3fbfdefe98e5d35e32d74138ce73a1b4e2fe5465
+# VUE_APP_API = 'http://192.168.0.35:10022/'
+# VUE_APP_API = 'http://192.168.0.15:10022/'
 
 VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
 

--
Gitblit v1.9.3