From 0f17de2da3b49a27a89ec7c897f52a9386312585 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期六, 22 二月 2025 11:04:56 +0800 Subject: [PATCH] Merge branch 'dev' into dev_dz --- cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java index 7fd3f3e..840cd80 100644 --- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java +++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java @@ -70,12 +70,12 @@ @ApiOperation(value = "瀹℃牳鏂囦欢鍙戞斁鍥炴敹") @PostMapping("/checkManageDocumentIssueRecycle") - public Result checkManageDocumentIssueRecycle(Integer id,String documentState){ - return Result.success(manageDocumentIssueRecycleService.checkManageDocumentIssueRecycle(id,documentState)); + public Result checkManageDocumentIssueRecycle(@RequestBody ManageDocumentIssueRecycle manageDocumentIssueRecycle){ + return Result.success(manageDocumentIssueRecycleService.checkManageDocumentIssueRecycle(manageDocumentIssueRecycle.getId(),manageDocumentIssueRecycle.getDocumentState())); } @ApiOperation(value = "瀵煎嚭鏂囦欢鍙戞斁鍥炴敹") - @PostMapping("/exportManageDocumentIssueRecycle") + @GetMapping("/exportManageDocumentIssueRecycle") public void exportManageDocumentIssueRecycle(ManageDocumentIssueRecycleDto manageDocumentIssueRecycleDto, HttpServletResponse response) throws Exception { manageDocumentIssueRecycleService.exportManageDocumentIssueRecycle(manageDocumentIssueRecycleDto,response); } -- Gitblit v1.9.3