From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index b0addba..bddf2ad 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -2,7 +2,6 @@
 
 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;
@@ -10,6 +9,7 @@
 public interface MonitorPointMapper extends BaseMapper<MonitorPoint>{
 	List<MonitorPoint> selectWithAreaNameByExample(Example example);
 	List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
-
-    List<MonitorPoint> selectWithStateByMap(Map<String, Object> params);
+    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