From 30d07fbe902f3013a65a7c00fa141b119610a8f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:54 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/service/HistoryService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 2ab5e0e..ebcae1f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -36,5 +36,7 @@
     //������������������������������
 	List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
 
+	String getJsonData(String mac,String time,String table);
+
 
 }

--
Gitblit v1.8.0