From 68a42ee3b831e9f973c817a9792a79e5f0e4d9f3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 03 三月 2025 09:10:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceScrappedController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceScrappedController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceScrappedController.java
index 9bada11..95794eb 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceScrappedController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceScrappedController.java
@@ -35,7 +35,7 @@
* @return
*/
@ApiOperation(value = "璁惧鎶ュ簾鐢宠鍒楄〃")
- @PostMapping("/pageDeviceScrapped")
+ @GetMapping("/pageDeviceScrapped")
public Result<IPage<DeviceScrapped>> pageDeviceScrapped(Page page, DeviceScrapped deviceScrapped) {
return Result.success(deviceScrappedService.pageDeviceScrapped(page, deviceScrapped));
}
@@ -55,7 +55,7 @@
* @return
*/
@ApiOperation(value = "鍒犻櫎璁惧鎶ュ簾鐢宠")
- @GetMapping("/delDeviceScrapped")
+ @DeleteMapping("/delDeviceScrapped")
public Result delDeviceScrapped(Integer scrappedId){
return Result.success(deviceScrappedService.removeById(scrappedId));
}
--
Gitblit v1.9.3