Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-25 7405ce915a649b92c51c2120b0a60b6d599454d1

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

@@ -60,7 +60,7 @@
        if (pointSetting.getData() != null) {
            userSignRecord.setPoint(pointSetting.getData().getSignPoint());
        }else {
            userSignRecord.setPoint(BigDecimal.ZERO);
            userSignRecord.setPoint(0);
        }
        R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet();
        userSignRecord.setRedAmount(bigDecimalR.getData());