Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

9 天以前 ce1985a0fc44cb2a8ca5f70cb2361556712804d0

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

@@ -83,21 +83,25 @@
    /**
     * 本次充值金额
     */
    @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 refundAmount;

    /**
     * 充值后金额，充值时余额 + 本次充值金额 + 本次赠送金额
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Float afterRecharge;

    /**
@@ -108,6 +112,7 @@
    /**
     * 水价
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Float price;

    /**