Merge remote-tracking branch 'origin/master'

puzhibing

2024-11-01 6ce963b426a53aa2a06883f3eb6c0de3c270d89d

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -289,6 +289,7 @@
            for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : dataList) {
                if(!sdf.format(uploadRealTimeMonitoringData.getCreate_time()).equals(t)){
                    dataLists.add(uploadRealTimeMonitoringData);
                    t = sdf.format(uploadRealTimeMonitoringData.getCreate_time());
                }
            }