From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/AlarmUserService.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/AlarmUserService.java b/src/main/java/com/moral/service/AlarmUserService.java
index 3f80fe9..a7d618b 100644
--- a/src/main/java/com/moral/service/AlarmUserService.java
+++ b/src/main/java/com/moral/service/AlarmUserService.java
@@ -12,8 +12,6 @@
 
 	Integer saveOrUpdatealarmUser(AlarmUser alarmUser);
 
-	Integer deletealarmUserByLogic(AlarmUser alarmUser);
-
 	Integer deletealarmUsersByLogic(List<Integer> ids);
 
 }

--
Gitblit v1.8.0