From ec1f20c31d64ddbc5242c3942902bc5233a8a140 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 四月 2025 10:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java
index 9ee8ffe..f7b9e83 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java
@@ -36,7 +36,7 @@
*/
@ApiOperation("鍒嗛〉鏌ヨ璁惧淇濆吇璁″垝")
@GetMapping("selectDeviceMaintenancePlanByPage")
- public Result<IPage<DeviceMaintenancePlan>> selectDeviceMaintenancePlanByPage(IPage page, DeviceMaintenancePlanDto itemParameter){
+ public Result<IPage<DeviceMaintenancePlan>> selectDeviceMaintenancePlanByPage(Page page, DeviceMaintenancePlanDto itemParameter){
return deviceMaintenancePlanService.selectDeviceMaintenancePlanByPage(page, itemParameter);
}
@@ -65,7 +65,7 @@
* @param deviceMaintenancePlanDto 璁惧淇濆吇璁″垝
*/
@ApiOperation("鍒犻櫎璁惧淇濆吇璁″垝")
- @GetMapping("/deleteMaintenancePlan")
+ @DeleteMapping("/deleteMaintenancePlan")
public Result deleteMaintenancePlan(DeviceMaintenancePlanDto deviceMaintenancePlanDto) {
return deviceMaintenancePlanService.deleteMaintenancePlan(deviceMaintenancePlanDto);
}
--
Gitblit v1.9.3