Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

@@ -26,4 +26,8 @@
   List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);



   List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);



    List<Integer> queryVersionsById(Integer id);



    MonitorPoint queryMonitorPointById(Integer mpointId);

}