Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

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

@@ -22,4 +22,6 @@
   

   List<MonitorPoint> getMonitorPointsByName(String name);

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



   List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);

}