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

Pu Zhibing

2025-02-12 697582a7e65e6110a22dad7bc8241d25fe3ecc51

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

@@ -80,4 +80,6 @@
    List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status);

    BigDecimal getSumAmount(LocalDate sixBefore);

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