From 314ce3e7db241c20287965a8caf509d8a9475db6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 22 二月 2025 10:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentIssueRecycleController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2bc1403..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
@@ -43,7 +43,7 @@
@ApiOperation(value = "鏂板鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/addManageDocumentIssueRecycle")
- public Result addManageDocumentIssueRecycle(@RequestBody ManageDocumentIssueRecycle manageDocumentIssueRecycle){
+ public Result addManageDocumentIssueRecycle(ManageDocumentIssueRecycle manageDocumentIssueRecycle){
return Result.success(manageDocumentIssueRecycleService.addManageDocumentIssueRecycle(manageDocumentIssueRecycle));
}
@@ -63,19 +63,19 @@
@ApiOperation(value = "缂栬緫鏂囦欢鍙戞斁鍥炴敹")
@PostMapping("/doManageDocumentIssueRecycle")
- public Result doManageDocumentIssueRecycle(@RequestBody ManageDocumentIssueRecycle manageDocumentIssueRecycle){
+ public Result doManageDocumentIssueRecycle(ManageDocumentIssueRecycle manageDocumentIssueRecycle){
return Result.success(manageDocumentIssueRecycleService.doManageDocumentIssueRecycle(manageDocumentIssueRecycle));
}
@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