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

xuhy

2025-06-24 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 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