Merge remote-tracking branch 'git-pipIrr/master'

liurunyu

2024-12-21 4c97a2ce0b749232584a50998bdd12ed9a6062d2

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDayLast.java

@@ -59,6 +59,7 @@
    /**
     * 日取水量（不包括漏损水量）
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double amount;

    /**
@@ -82,6 +83,7 @@
    /**
     * 最后计水量时控制器累计水量
     */
    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
    public Double totalAmountLast;

    /**