From a2eeba84bed5de1c19b74279ee7f096b5eff5528 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 13 九月 2023 11:50:00 +0800
Subject: [PATCH] 1、加载分类的时候提示没有编码规则错误，同时处理由此导致的RMDataTransmitObject未初始化保存问题，在创建bean时就进行了初始化。

---
 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