Merge remote-tracking branch 'origin/master'

zuojincheng

2025-06-24 07386c2258263d8f9c357f581d2ec2f3a4696cbf

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

@@ -49,11 +49,13 @@
    /**
     * 本次花费金额
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Float moneyAmount;

    /**
     * 本次用水量
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    private Float waterAmount;

    /**