From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceService.java b/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
index beaab33..2553bd7 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
@@ -23,8 +23,8 @@
     public void synchAllCabinet(JSONArray jsonObject) throws ApiException;
 
     public void alarm(JSONObject jsonObject) throws ApiException;
-    
-    public void alarmperson(JSONObject jsonObject) throws ApiException, IOException;
+
+    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