Merge remote-tracking branch 'origin/master'

wuzeyu

2024-12-13 dd2259bcc1cfe4e31f297af3df1e94d2b95d7476

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRechargeNew.java

@@ -40,16 +40,19 @@
    /**
     * 充值金额
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Float amount;

    /**
     * 赠送金额
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Float gift;

    /**
     * 充值后余额
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Float afterRecharge;

    /**