From 99755eea33cf009c36507df468c244f3be5b34c9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 17:27:31 +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/DeviceCalibrationPlanController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceCalibrationPlanController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceCalibrationPlanController.java
index 37aed61..8523011 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceCalibrationPlanController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceCalibrationPlanController.java
@@ -81,8 +81,8 @@
* @return
*/
@ApiOperation(value = "璁惧鏍″噯璁″垝鍒犻櫎")
- @DeleteMapping("/delQualitySupervise")
- public Result delQualitySupervise(Integer planId){
+ @DeleteMapping("/delDeviceCalibrationPlan")
+ public Result delDeviceCalibrationPlan(Integer planId){
return Result.success(deviceCalibrationPlanService.removeById(planId));
}
@@ -122,7 +122,7 @@
* @return
*/
@ApiOperation(value = "璁惧鏍″噯璁″垝璇︽儏鍒楄〃")
- @PostMapping("/pageDeviceCalibrationPlanDetail")
+ @GetMapping("/pageDeviceCalibrationPlanDetail")
public Result<IPage<DeviceCalibrationPlanDetail>> pageDeviceCalibrationPlanDetail(Page page, DeviceCalibrationPlanDetail deviceCalibrationPlanDetails) {
return Result.success(deviceCalibrationPlanService.pageDeviceCalibrationPlanDetail(page, deviceCalibrationPlanDetails));
}
@@ -155,7 +155,7 @@
* @return
*/
@ApiOperation(value = "鍒犻櫎璁惧鏍″噯璁″垝璇︽儏")
- @GetMapping("/delDeviceCalibrationPlanDetail")
+ @DeleteMapping("/delDeviceCalibrationPlanDetail")
public Result delDeviceCalibrationPlanDetail(Integer planDetailsId){
return Result.success(deviceCalibrationPlanDetailService.removeById(planDetailsId));
}
--
Gitblit v1.9.3