From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

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

--
Gitblit v1.8.0