From 93cfe891a02766e0c56c5781eb6ca8a5cc5fb16f Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 31 七月 2024 11:43:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java index 64effb0..96c7c05 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java @@ -5,13 +5,13 @@ import com.vci.corba.omd.lcm.Bound; import com.vci.corba.omd.lcm.LifeCycle; import com.vci.corba.omd.lcm.TransitionVO; +import com.vci.pagemodel.*; import com.vci.starter.web.annotation.log.VciUnLog; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.BaseQueryObject; import com.vci.starter.web.pagemodel.DataGrid; import com.vci.starter.web.util.VciDateUtil; -import com.vci.web.model.OsLifeCycleDO; -import com.vci.web.pageModel.*; +import com.vci.model.OsLifeCycleDO; import com.vci.web.service.OsLifeCycleServiceI; import com.vci.web.service.OsStatusServiceI; import com.vci.web.service.WebBoServiceI; @@ -28,9 +28,9 @@ import java.util.*; import java.util.stream.Collectors; -import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST; -import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL; -import static com.vci.web.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR; +import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_ID_NOT_EXIST; +import static com.vci.constant.WebLangCodeConstant.LIFE_CYCLE_ROUTER_NULL; +import static com.vci.constant.WebLangCodeConstant.LIFE_CYCLE_TRANS_ERROR; /** * 鐢熷懡鍛ㄦ湡鏈嶅姟 @@ -483,7 +483,7 @@ } /** - * 鐘舵�佸湪鐢熷懡鍛ㄦ湡涓娇鐢ㄧ殑鍕ゅ揩 + * 鐘舵�佸湪鐢熷懡鍛ㄦ湡涓娇鐢ㄧ殑鑼冨洿 * * @param statusOid 鐘舵�佺殑涓婚敭 * @return 鐢熷懡鍛ㄦ湡鐨勪俊鎭� -- Gitblit v1.9.3