Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-09-03 ca66f2f175e6b66eda193ce58439515a9484e6b7

 src/main/java/com/moral/service/impl/HistoryServiceImpl.java

@@ -413,7 +413,6 @@
            break;

         }

      }

      System.out.println(organizationIdList);

      

      //根据组织id获取站点id

      List<Map<String, Object>> monitorPointIdListMap = monitorPointMapper.getIdByOrganizationId(organizationIdList);