Merge remote-tracking branch 'origin/master'

xuhy

2025-03-26 ccd1837ee6016e0b72557f98ea45fc2e4f152ae1

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java

@@ -80,7 +80,7 @@

    List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status);

    BigDecimal getSumAmount(LocalDateTime sixBefore);
    BigDecimal getSumAmount();

    List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto);
}