From a768bf08d33635cff018c6cda0e989245fc0a072 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Oct 2017 11:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/monitor/service/ScreenService.java b/src/main/java/com/moral/monitor/service/ScreenService.java
index 7e217b7..7265a13 100644
--- a/src/main/java/com/moral/monitor/service/ScreenService.java
+++ b/src/main/java/com/moral/monitor/service/ScreenService.java
@@ -1,6 +1,7 @@
 package com.moral.monitor.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.moral.monitor.entity.AccountEntity;
 
@@ -8,4 +9,8 @@
 
 	List<AccountEntity> getAccountLists(String account, String password);
 
+	Map<String, Object> getDataByEquipmentMac(Map<String, Object> parameters);
+
+	Map<String, Object> getAverageByAll(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0