Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-05-13 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38

 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java

@@ -30,7 +30,7 @@

      List<DataResPo> cdList = getResCdList(type);
      cdList.forEach(dataResPo -> {
         if (dataResPo.getChildren() != null){
         if (dataResPo.getChildren() != null && dataResPo.getChildren().size()>0){
            BatchDataPo batchDataPo = new BatchDataPo(dataResPo, type);
            nkyService.batchData(batchDataPo);
         }