From f1e25082a58c8cb57dd45d226d3a94f4af4a0677 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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