Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-01 af8dd6eccb0aab770246ae44db1cde4e531416c5

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

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

}