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

无关风月

2025-08-26 960380f89c9371ba309d6c50b1ab1b677ea74575

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -571,7 +571,7 @@
        if (result == null || result.get("total_points") == null) {
            userStatistics.setTotalScore(0L);
        }else {
            userStatistics.setTotalScore(((BigDecimal) result.get("total_points")).longValue());
            userStatistics.setTotalScore(Long.valueOf(result.get("total_points").toString()));
        }
        //条件构造  消费积分现金支付金额
        queryWrapper.clear();