From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001 From: JinPengYong <812110275@qq.com> Date: Sun, 26 Apr 2020 16:18:30 +0800 Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts. --- src/main/java/com/moral/controller/AlarmUserController.java | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/moral/controller/AlarmUserController.java b/src/main/java/com/moral/controller/AlarmUserController.java index e2ce35f..c40e2e2 100644 --- a/src/main/java/com/moral/controller/AlarmUserController.java +++ b/src/main/java/com/moral/controller/AlarmUserController.java @@ -39,13 +39,7 @@ return new ResultBean<Integer>(code); } - @PostMapping("alarmUser/id") - public ResultBean<Integer> deletealarmUserByLogic(@RequestBody AlarmUser alarmUser) { - Integer result = alarmUserService.deletealarmUserByLogic(alarmUser); - return new ResultBean<Integer>(result); - } - - @PostMapping("alarmUsers/ids") + @PostMapping("ids") public ResultBean<Integer> deleteAccountsByLogic(@RequestBody List<Integer> ids) { Integer result = alarmUserService.deletealarmUsersByLogic(ids); return new ResultBean<Integer>(result); -- Gitblit v1.8.0