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

liurunyu

8 天以前 52cd0fe6f2224b0bd17b19ddaf475406a92b9ed4

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenClostWechat.java

@@ -23,6 +23,7 @@
    /**
     * 消费金额
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Double expense;

    /**
@@ -57,6 +58,7 @@
    /**
     * 用水量
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Double amount;

    /**