From 3ec412f3cdc8b114cf629e866a7b7b80687a3442 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 18 Jan 2021 10:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/InterfaceService.java | 3 ++-
1 files changed, 2 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 d85afcf..a1b6143 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceService.java
@@ -24,7 +24,7 @@
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,5 @@
public List<SysUser> getUserListByContainerCode(String containerCode, String startTime,String endTime) throws ApiException;
+ List<SysUser> getUserListByContainerCodeNew(String containerCode, String startTime, String endTime) throws ApiException;
}
--
Gitblit v1.9.2