Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-23 d057951d5bf2f95fd7c7de0eea27967c8dbb2c92

Merge remote-tracking branch 'origin/master'

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

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

@@ -785,7 +785,7 @@
        LocalDate end = null;
        if (statisticsQueryDto.getDayType()==1){
            start = LocalDate.now();
            end = LocalDate.now();
            end = LocalDate.now().plusDays(1);

        }else if (statisticsQueryDto.getDayType()==2){
            LocalDate today = LocalDate.now();