From 0ee44e75029923734744628a8b059fa41ff3ef55 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期六, 05 八月 2023 10:48:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index c9054d5..b13e2ff 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -1,6 +1,7 @@
package com.ruoyi.app.patrolplan.controller;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -109,9 +110,11 @@
@Log(title = "app宸℃璁″垝", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@ApiOperation("鍒犻櫎app宸℃璁″垝")
- public Results remove(@PathVariable String id)
+ //public Results remove(@PathVariable String id)
+ public AjaxResult remove(@PathVariable String id)
{
- return ardAppPatrolplanService.deleteArdApp(id);
+ //return ardAppPatrolplanService.deleteArdApp(id);
+ return toAjax(ardAppPatrolplanService.deleteArdApp(id));
}
@@ -137,4 +140,15 @@
return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
}
+ /**
+ * 鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:insertArdAppPatrolplan')")
+ @Log(title = "app宸℃璁″垝", businessType = BusinessType.INSERT)
+ @PostMapping("/insertArdAppPatrolplan")
+ @ApiOperation("鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�")
+ public AjaxResult addArdAppPatrolplan(@RequestBody Map<String,Object> para)
+ {
+ return toAjax(ardAppPatrolplanService.insertArdAppPatrolplan(para));
+ }
}
--
Gitblit v1.9.3