Merge branch 'dev' into dev_ly

zhuo

2025-02-24 e8e73529983bf656d8aa6627215045f56cc27103

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenancePlanController.java

@@ -65,7 +65,7 @@
     * @param deviceMaintenancePlanDto 设备保养计划
     */
    @ApiOperation("删除设备保养计划")
    @GetMapping("/deleteMaintenancePlan")
    @DeleteMapping("/deleteMaintenancePlan")
    public Result deleteMaintenancePlan(DeviceMaintenancePlanDto deviceMaintenancePlanDto) {
        return deviceMaintenancePlanService.deleteMaintenancePlan(deviceMaintenancePlanDto);
    }