From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
index f003a48..f479364 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
@@ -2,11 +2,11 @@
 
 import com.vci.corba.common.PLException;
 import com.vci.corba.omd.stm.StatePool;
+import com.vci.dto.OsStatusDTO;
+import com.vci.pagemodel.OsStatusVO;
 import com.vci.starter.web.pagemodel.BaseResult;
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.dto.OsStatusDTO;
-import com.vci.pagemodel.OsStatusVO;
 
 import java.io.File;
 import java.util.Collection;
@@ -25,14 +25,14 @@
      * @param statePool 鐘舵�佹睜鐨勬暟鎹璞�
      * @return 鏄剧ず瀵硅薄
      */
-    OsStatusVO statusDO2VO(com.vci.corba.omd.stm.StatePool statePool);
+    OsStatusVO statusDO2VO(StatePool statePool);
 
     /**
      * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
      * @param statePools 鐘舵�佹睜鐨勬暟鎹璞� 闆嗗悎
      * @return 鏄剧ず瀵硅薄
      */
-    List<OsStatusVO> statusDO2VOs(Collection<com.vci.corba.omd.stm.StatePool> statePools);
+    List<OsStatusVO> statusDO2VOs(Collection<StatePool> statePools);
 
     /**
      * 鏌ヨ鎵�鏈夌殑鐘舵��

--
Gitblit v1.9.3