Merge remote-tracking branch 'origin/master'

xuhy

2024-09-09 65a706a1095e49f1ee5f884e0520da7cc55d052b

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

@@ -1245,6 +1245,7 @@
      }
      // 不分页
      List<ChargingOrderListVO> list1 = this.baseMapper.chargingList1(dto,startTime1,startTime2,endTime1,endTime2);
      chargingOrderTimeVO.setExportList(list1);
      chargingOrderTimeVO.setOrderCount(list1.size());
      // 计算充电总度数
      BigDecimal electronic = new BigDecimal("0");