From 7f905053f3f879092e18558401185dd6595dbe10 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 15:11:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 5d8905f..aa9cef8 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -21,5 +21,7 @@
 	public void deleteByIds(Integer... ids);
 	
 	List<MonitorPoint> getMonitorPointsByName(String name);
+    List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
 
+	List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
 }

--
Gitblit v1.8.0