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