Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-26 38dd608cededdcc6f53dfd99c377da254fdd1766

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -823,7 +823,7 @@
                BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
                dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
                dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime());
                dataDto.setStatus(chargingOrderVO.getStatus());
                dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
                dtos.add(dataDto);
            }else {
                continue;