Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

 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;

@@ -12,4 +11,5 @@
   List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);

    List<MonitorPoint> selectByMap(Map<String, Object> params);

    List<Integer> selectOrganizationIds(int id);

    List<Integer> selectVersionsById(int id);

}