Merge remote-tracking branch 'origin/master'

田源

2023-08-03 751861c71c9b0a8fe9499e6c6d62b231ccc42f0e

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