From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java
index 88d06a4..5217beb 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java
@@ -63,7 +63,6 @@
 	 * 涓绘暟鎹笟鍔℃湇鍔�
 	 */
 
-
 	/**
 	 * 鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹�
 	 * @param dockingReturnStoreVO
@@ -206,7 +205,7 @@
 				dockingPreClassify.setPid(pid);
 				dockingPreClassify.setId(classNumber);
 				dockingPreClassify.setNodeLink(nodeLink);
-				dockingPreClassify.setGetNodeLinkName(nodeLinkName);
+				dockingPreClassify.setNodeLinkName(nodeLinkName);
 				dockingPreClassify.setClassName(className);
 				dockingPreClassifyArrayList.add(dockingPreClassify);
 				// 鑾峰彇瀵瑰簲鐨勫垎绫昏鍥炬ā鍨�

--
Gitblit v1.9.3