From 7a31cf800bcc70d598c63863f637cf0a183a940e Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 11:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
index e014434..5ba719e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
@@ -14,6 +14,7 @@
import com.aps.core.service.IApsProcessRouteTempService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -40,9 +41,9 @@
*/
@RequiresPermissions("processRoute:processRoute:list")
@GetMapping("/list")
- public TableDataInfo list(ApsProcessRoute apsProcessRoute)
+ public TableDataInfo list(ApsProcessRoute apsProcessRoute, Pageable pageable)
{
-// startPage();
+ startPage();
List<ApsProcessRoute> list = apsProcessRouteService.selectApsProcessRouteList(apsProcessRoute);
return getDataTable(list);
}
--
Gitblit v1.9.3