From 392366ea36a839e5d0ea05968e6da31cd53a9ee6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 八月 2025 14:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/controller/ArchiveController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/ArchiveController.java b/main-business/src/main/java/com/ruoyi/business/controller/ArchiveController.java
index 1e7cefe..3f934be 100644
--- a/main-business/src/main/java/com/ruoyi/business/controller/ArchiveController.java
+++ b/main-business/src/main/java/com/ruoyi/business/controller/ArchiveController.java
@@ -29,8 +29,8 @@
* 鏌ヨ妗ｆ淇℃伅琛�
*/
@GetMapping("/list")
- public R<IPage<Archive>> treeList(Page page, ArchiveDto archiveDto) {
- IPage<Archive> list = archiveService.selectArchiveList(page, archiveDto);
+ public R<IPage<ArchiveDto>> treeList(Page<Archive> page, ArchiveDto archiveDto) {
+ IPage<ArchiveDto> list = archiveService.selectArchiveList(page, archiveDto);
return R.ok(list);
}
--
Gitblit v1.9.3