From 3be6b8a0b31b780f626724691fcb304de3b7d9f2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 06 九月 2024 17:06:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
index 1bf3112..85c87d8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIManagerServiceI.java
@@ -9,10 +9,8 @@
 import com.vci.starter.web.pagemodel.BaseQueryObject;
 import com.vci.starter.web.pagemodel.BaseResult;
 import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.dto.RoleRightDTO;
 import com.vci.dto.UIAuthorDTO;
 import com.vci.starter.web.pagemodel.Tree;
-import com.vci.model.PLDefination;
 import com.vci.pagemodel.PLDefinationVO;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
@@ -80,7 +78,7 @@
     /**
      * 鏍规嵁涓婁笅鏂嘔D鍜屽尯鍩熺被鍨嬶紝鎸夐『搴忚幏鍙栧綋鍓嶅尯鍩熺殑tab椤�
      */
-    List<PLTabPage> getTabByContextIdAndType(String contextId, int areaType) throws PLException;
+    DataGrid getTabByContextIdAndType(String contextId, int areaType) throws PLException;
 
     /**
      * 娣诲姞鍖哄煙鏁版嵁
@@ -116,7 +114,7 @@
      * @param plPageContextOId
      * @return
      */
-    List<PLPageDefination> getPLPageDefinations(String plPageContextOId);
+    DataGrid getPLPageDefinations(String plPageContextOId) throws PLException;
 
     /**
      * 娣诲姞椤甸潰瀹氫箟

--
Gitblit v1.10.0