From f67aa8b146f0fa901ce4ae183be511d8615cde77 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 14:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
index 7ba9d7d..b206980 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
@@ -100,7 +100,7 @@
*/
@ApiOperation(value = "鏌ヨ瀛樻。")
@GetMapping("/pageSearchNewArchived")
- public Result<IPage<ProcessMethodSearchNewArchivedDto>> pageSearchNewArchived(ProcessMethodSearchNewArchivedDto archived,Page page) throws Exception {
+ public Result pageSearchNewArchived(ProcessMethodSearchNewArchivedDto archived,Page page) throws Exception {
return Result.success(processMethodSearchNewService.pageSearchNewArchived(page, archived));
}
--
Gitblit v1.9.3