From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:54:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index 1483e61..bddf2ad 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -2,11 +2,14 @@
 
 import java.util.List;
 import java.util.Map;
-
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.MonitorPoint;
+import tk.mybatis.mapper.entity.Example;
 
 public interface MonitorPointMapper extends BaseMapper<MonitorPoint>{
-
+	List<MonitorPoint> selectWithAreaNameByExample(Example example);
 	List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
+    List<MonitorPoint> selectByMap(Map<String, Object> params);
+    List<Integer> selectOrganizationIds(int id);
+    List<Integer> selectVersionsById(int id);
 }
\ No newline at end of file

--
Gitblit v1.8.0