Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-12 e9dcc1d3da82d6de18a81279c3f87773de7b4cfa

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java

@@ -546,5 +546,10 @@
        return this.baseMapper.getSumAmount(sixBefore);
    }

    @Override
    public List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto) {
        return this.baseMapper.getData(statisticsQueryDto);
    }


}