Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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

@@ -11,5 +11,5 @@
   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);

}