From 2dc82639ec241aa69f75f7fa6dce5df4942a5665 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 15 十二月 2023 13:34:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java b/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
index 892ab0b..2208a0e 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
@@ -105,11 +105,10 @@
@ApiOperation("鎭㈠鎶ヨ杩囨护")
@PreAuthorize("@ss.hasPermi('alarm:filter:edit')")
@Log(title = "鎭㈠鎶ヨ杩囨护", businessType = BusinessType.UPDATE)
- @PutMapping("/recovery")
- public AjaxResult recovery(@RequestBody ArdAlarmFilter ardAlarmFilter)
+ @PutMapping("/recovery/{ids}")
+ public AjaxResult recovery(@PathVariable String[] ids)
{
- ardAlarmFilter.setEndTime(DateUtils.covertTime(new Date()));
- return toAjax(ardAlarmFilterService.updateArdAlarmFilter(ardAlarmFilter));
+ return toAjax(ardAlarmFilterService.RecoveryArdAlarmFilter(ids));
}
/**
* 鍒犻櫎鎶ヨ杩囨护
--
Gitblit v1.9.3