Merge remote-tracking branch 'origin/master'

沈斌

2018-02-08 9e1db983254a475fd7a069937c3f706fe2efe9b4

 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);

}