Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/java/com/moral/service/MonitorPointService.java

@@ -28,4 +28,6 @@
   List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);



    List<Integer> queryVersionsById(Integer id);



    MonitorPoint queryMonitorPointById(Integer mpointId);

}