From 1f4f4e70d52015a5130bcea73be87bb8b1e3212d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 21 九月 2023 17:40:30 +0800
Subject: [PATCH] #添加主播地址信息

---
 company_admin/.env.development |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/company_admin/.env.development b/company_admin/.env.development
index 02e8212..e53d86e 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 = 'https://dmtest.ahapp.net/preselect_web_interface/'
 

--
Gitblit v1.9.3