From 15286a9ab39823ddbbf682e1049f39dfc5dd024f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 六月 2025 18:16:50 +0800
Subject: [PATCH] git ch

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

diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index b438032..77ad9b7 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -11,6 +11,10 @@
 
 # VUE_APP_API = 'http://localhost:10031/'
 
+<<<<<<< HEAD
 # VUE_APP_API = 'http://192.168.0.138:10031/'
+=======
+VUE_APP_API = 'http://192.168.0.138:10031/'
+>>>>>>> 5337d6006b45ca61881623ad2e8738e03ad3bde2
 
 VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'

--
Gitblit v1.9.3