From 3e2436955a5daf512098dc879c470ee88ce003eb Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:12:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/MonitorPointMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index d05e398..1483e61 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -1,11 +1,12 @@
 package com.moral.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.MonitorPoint;
 
 public interface MonitorPointMapper extends BaseMapper<MonitorPoint>{
 
-	List<MonitorPoint> getMonitorPointsByAreaName(String areaName);
+	List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
 }
\ No newline at end of file

--
Gitblit v1.8.0