From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java
index 885903d..60b79d2 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/EnumitemWrapper.java
@@ -54,6 +54,7 @@
 		}
 		return enumItemVO;
 	}
+
 	public List<EnumVO> listNodeVO(List<EnumItem> list) {
 		List<EnumItem> collect = list.stream().map(omdEnumItem -> BeanUtil.copy(omdEnumItem, EnumItem.class)).collect(Collectors.toList());
 		return ForestNodeMerger.merge((List)collect);

--
Gitblit v1.10.0