From a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Wed, 03 Feb 2021 16:10:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/InterfaceService.java | 7 +++++--
1 files changed, 5 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 d85afcf..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;
@@ -38,4 +38,7 @@
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