Merge remote-tracking branch 'origin/dev' into dev

xuhy

2025-06-24 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 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);
}