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/impl/OsPortalVIServiceImpl.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 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 4f196fe..d6ec36d 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
@@ -11,7 +11,9 @@
 import com.vci.corba.portal.PortalService.GetPagePortalVIArrayByPageInfoResult;
 import com.vci.corba.portal.data.PortalVI;
 import com.vci.dto.*;
-import com.vci.model.*;
+import com.vci.enumpck.UI.ItemTypeEnum;
+import com.vci.model.PRMDO;
+import com.vci.model.PRMItemDO;
 import com.vci.pagemodel.*;
 import com.vci.po.PortalVIPO;
 import com.vci.po.QTDPO;
@@ -25,12 +27,8 @@
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.starter.web.util.LocalFileUtil;
 import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.word.bo.WordMergeStartTableDataBO;
-import com.vci.starter.word.util.WordUtil;
-import com.vci.web.enumpck.ItemTypeEnum;
 import com.vci.web.enumpck.PortalVIType;
 import com.vci.web.enumpck.PortalVITypeFlag;
-import com.vci.web.other.BtmQTExportData;
 import com.vci.web.service.OsAttributeServiceI;
 import com.vci.web.service.OsPortalVIServiceI;
 import com.vci.web.service.OsQuereyTemplateServiceI;
@@ -44,11 +42,12 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

--
Gitblit v1.9.3