From 770361cf5d70c7893ffea4f1dacac297628aea1d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 20 六月 2025 18:03:00 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after
---
main-business/src/main/java/com/ruoyi/business/controller/ArchiveController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..4e4ca1a 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
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.ArchiveDto;
-import com.ruoyi.business.entity.Archive;
import com.ruoyi.business.service.ArchiveService;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
@@ -29,8 +28,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 page, ArchiveDto archiveDto) {
+ IPage<ArchiveDto> list = archiveService.selectArchiveList(page, archiveDto);
return R.ok(list);
}
--
Gitblit v1.9.3