From beadbecb4ec7aaf960b8e46f5c02836bf6c9e976 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 08 四月 2024 16:14:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
index 9a7c1f1..266bcbb 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
@@ -3,10 +3,9 @@
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.starter.web.pagemodel.PageHelper;
 import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.OsBtmTypeVO;
 import com.vci.web.pageModel.OsEnumItemVO;
 import com.vci.web.pageModel.OsEnumVO;
-import plm.corba.enumManager.EnumItem;
+import  com.vci.corba.omd.etm.EnumItem;
 
 import java.util.Collection;
 import java.util.List;

--
Gitblit v1.9.3