Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-28 9d23c9e2cfee3e02cb727773be0a61cb7cc64932

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

@@ -833,7 +833,7 @@
        }

        PageChargingOrderAndUploadRealTimeMonitoringDataDto page = new PageChargingOrderAndUploadRealTimeMonitoringDataDto();
        page.setCount(data1.getCount());
        page.setTotal(data1.getCount());
        page.setRecords(dtos);

        return R.ok(page);