Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

 src/main/java/com/moral/mapper/MonitorPointMapper.java

@@ -10,6 +10,6 @@
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);

}