Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-03-20 1d1e3c49ebd29144b2f6ce8710523bae763b855b

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

@@ -76,8 +76,8 @@
    }

    @Override
    public BigDecimal getSumAmout(LocalDateTime sixBefore) {
        return this.baseMapper.getSumAmout(sixBefore);
    public BigDecimal getSumAmout() {
        return this.baseMapper.getSumAmout();
    }

    @Override