From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java
index ef1e472..071fa1b 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java
@@ -25,7 +25,7 @@
* app宸℃璁″垝浜哄憳Controller
*
* @author ard
- * @date 2023-08-02
+ * @date 2023-08-04
*/
@RestController
@RequestMapping("/app/patroluser")
@@ -63,10 +63,10 @@
* 鑾峰彇app宸℃璁″垝浜哄憳璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('app:patroluser:query')")
- @GetMapping(value = "/{reserved1}")
- public AjaxResult getInfo(@PathVariable("reserved1") String reserved1)
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
{
- return success(ardAppPatroluserService.selectArdAppPatroluserByReserved1(reserved1));
+ return success(ardAppPatroluserService.selectArdAppPatroluserById(id));
}
/**
@@ -91,4 +91,14 @@
return toAjax(ardAppPatroluserService.updateArdAppPatroluser(ardAppPatroluser));
}
+ /**
+ * 鍒犻櫎app宸℃璁″垝浜哄憳
+ */
+ @PreAuthorize("@ss.hasPermi('app:patroluser:remove')")
+ @Log(title = "app宸℃璁″垝浜哄憳", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(ardAppPatroluserService.deleteArdAppPatroluserByIds(ids));
+ }
}
--
Gitblit v1.9.3