Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-05 86916a5b7c8ed98221c03e440a9aad0f38109263

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

@@ -23,9 +23,13 @@
   List<MonitorPoint> getMonitorPointsByName(String name);

    List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);



   List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);

    Integer countOfSubOrgs(Integer orgId);



    List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);



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



    List<Integer> queryVersionsById(Integer id);



    MonitorPoint queryMonitorPointById(Integer mpointId);

}