From 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期二, 26 一月 2021 18:08:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- 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