From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

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

diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 77ad9b7..2786b92 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -11,10 +11,8 @@
 
 # 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 = 'http://192.168.0.132:10031/'
 
 VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'

--
Gitblit v1.9.3