Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-26 7c9305fc42b4620f263ed2207a8d6e0364e6f293

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

@@ -500,6 +500,7 @@
            BigDecimal chargingCapacity = new BigDecimal("0");
            orderCount+=tChargingOrders.size();
            chargingBillVO.setCategory("");
            chargingBillListVO.setOrderCount(tChargingOrders.size());
            chargingBillVO.setExportList(tChargingOrders);

            for (TChargingOrder tChargingOrder : tChargingOrders) {