Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-16 aabc4259054c8a213b4181334f6ca3a22c66d87d

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