From d7427ab305dc17af447f5832903691eee329850c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 09:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yufei' into yufei

---
 src/main/java/com/nanometer/smartlab/service/InterfaceService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceService.java b/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
index a1b6143..2553bd7 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
@@ -23,7 +23,7 @@
     public void synchAllCabinet(JSONArray jsonObject) throws ApiException;
 
     public void alarm(JSONObject jsonObject) throws ApiException;
-    
+
     public void alarmperson(JSONObject jsonObject) throws Exception;
 
     public void cabinetData(JSONArray jsonObject) throws ApiException;
@@ -39,4 +39,6 @@
 	public List<SysUser> getUserListByContainerCode(String containerCode, String startTime,String endTime) throws ApiException;
 
     List<SysUser> getUserListByContainerCodeNew(String containerCode, String startTime, String endTime) throws ApiException;
+
+    public void delalarmperson(JSONObject jsonObject) throws Exception;
 }

--
Gitblit v1.9.2