From ba65926011f36ae9e98d373d33b33f9ad024d6c8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 28 八月 2023 10:24:30 +0800
Subject: [PATCH] 整合代码

---
 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index ab6aa12..3e77fb0 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -41,11 +41,7 @@
 	 * nacos dev 鍦板潃
 	 */
 	//String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
-<<<<<<< HEAD
 	String NACOS_DEV_ADDR = "127.0.0.1:8848";
-=======
-	String NACOS_DEV_ADDR = "localhost:8848";
->>>>>>> c31b334ae86c8c6240bed10c633513685322d052
 
 	/**
 	 * nacos prod 鍦板潃

--
Gitblit v1.9.3