From 46670e34c1105649da6091a0829b9451c9fe5b37 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 07 May 2018 14:44:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 992091b..b6fe1ac 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -22,4 +22,8 @@
 	
 	List<MonitorPoint> getMonitorPointsByName(String name);
     List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
+
+	List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+
+	List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
 }

--
Gitblit v1.8.0