From 3c3758573580e5da96ff501f111b038cb1fd8bc2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 18:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 3e77fb0..ab6aa12 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,7 +41,11 @@
 	 * 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