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

xuhy

2025-06-25 6ecf7171775a04bbcb52c9943bcafce699c837a7

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TShoppingOrderMapper.java

@@ -46,7 +46,7 @@

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

    BigDecimal getSumAmount(@Param("sixBefore")LocalDate sixBefore);
    BigDecimal getSumAmount();

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