Merge remote-tracking branch 'origin/master'

xuhy

2025-03-26 ccd1837ee6016e0b72557f98ea45fc2e4f152ae1

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