From d840c3e61bf8a9dc4f8e8133478daca9f4d545c0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 23 十月 2024 21:26: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/OsPortalVIServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
index f7d0e7b..0cb6b97 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
@@ -125,7 +125,7 @@
}
DataGrid<PortalVIVO> dataGrid = new DataGrid<>();
try {
- GetPagePortalVIArrayByPageInfoResult pagePortalVIArrayByPageInfoResult= platformClientUtil.getPortalService().getPagePortalVIArrayByPageInfo(typeName,viName,viType,viTypeFlag,pageIndex,pageSize);
+ GetPagePortalVIArrayByPageInfoResult pagePortalVIArrayByPageInfoResult = platformClientUtil.getPortalService().getPagePortalVIArrayByPageInfo(typeName,viName,viType,viTypeFlag,pageIndex,pageSize);
if(pagePortalVIArrayByPageInfoResult.total>0) {
PortalVI[] portalVIS = pagePortalVIArrayByPageInfoResult.returnValue;
List<PortalVIVO> portalVIVOS = portalVIDOO2VOS(Arrays.asList(portalVIS));
@@ -955,7 +955,7 @@
prmItemDO.setItemHrefConf(prmItemDO.getItemHrefConf());//瓒呴摼鎺ラ厤缃�
prmItemDO.setItemTips(prmItemDTO.getItemTips());
prmItemDO.setItemTrim(prmItemDTO.getItemTrim());
- prmItemDO.setItemDateFormat(prmItemDTO.getItemDateFormat());
+ //prmItemDO.setItemDateFormat(prmItemDTO.getItemDateFormat());
prmItemDO.setItemCtrlDisplyCondition(prmItemDTO.getItemCtrlDisplyCondition());////鎺у埗鏄剧ず鏉′欢
prmItemDO.setItemEditableProgram(prmItemDTO.getItemEditableProgram());
prmItemDO.setItemEditCondition(prmItemDTO.getItemEditCondition());
--
Gitblit v1.10.0