From 9ac162353268b6dec8563d9a20ca881290ba1e63 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 30 十月 2023 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/noguidezone/controller/ArdCameraNoGuideZoneController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/noguidezone/controller/ArdCameraNoGuideZoneController.java b/ard-work/src/main/java/com/ruoyi/device/noguidezone/controller/ArdCameraNoGuideZoneController.java
index d19e78d..0d24d71 100644
--- a/ard-work/src/main/java/com/ruoyi/device/noguidezone/controller/ArdCameraNoGuideZoneController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/noguidezone/controller/ArdCameraNoGuideZoneController.java
@@ -28,7 +28,7 @@
* 绂佸紩鍙鍩烠ontroller
*
* @author ard
- * @date 2023-10-27
+ * @date 2023-10-28
*/
@Api(tags = "绂佸紩鍙鍩熺鐞嗘帴鍙�")
@RestController
@@ -69,10 +69,10 @@
*/
@ApiOperation("鑾峰彇绂佸紩鍙鍩熻缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('device:noguidezone:query')")
- @GetMapping(value = "/{name}")
- public AjaxResult getInfo(@PathVariable("name") String name)
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
{
- return success(ardCameraNoGuideZoneService.selectArdCameraNoGuideZoneByName(name));
+ return success(ardCameraNoGuideZoneService.selectArdCameraNoGuideZoneById(id));
}
/**
@@ -105,9 +105,9 @@
@ApiOperation("鍒犻櫎绂佸紩鍙鍩�")
@PreAuthorize("@ss.hasPermi('device:noguidezone:remove')")
@Log(title = "绂佸紩鍙鍩�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{names}")
- public AjaxResult remove(@PathVariable String[] names)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
{
- return toAjax(ardCameraNoGuideZoneService.deleteArdCameraNoGuideZoneByNames(names));
+ return toAjax(ardCameraNoGuideZoneService.deleteArdCameraNoGuideZoneByIds(ids));
}
}
--
Gitblit v1.9.3