From 9aafec73f2a5df0ccee2712505c63d44d91336c6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 四月 2025 14:40:09 +0800
Subject: [PATCH] 1、端口、IP、标签配置.docx文档修改:民勤配置项变化; 2、农户取水年度统计逻辑变化; 3、灌溉计划迟延时间可配置。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
index c897110..7d46257 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
@@ -80,41 +80,49 @@
     /**
     * 鏈勾绱娴侀噺
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double waterTotalAmountYear;
 
     /**
     * 姘磋〃绱娴侀噺
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double waterTotalAmountMeter;
 
     /**
     * 鏈勾绱鐢甸噺
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double eleTotalAmountYear;
 
     /**
     * 鐢佃〃绱鐢甸噺
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double eleTotalAmountMeter;
 
     /**
     * 褰撴棩姘磋〃鍑�娴侀噺
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double waterTotalAmountDay;
 
     /**
     * 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double waterUserTotalAmountDay;
 
     /**
     * 婕忔崯姘撮噺
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double lossTotalAmountDay;
 
     /**
     * 鍚庡鐢垫睜鐢靛帇
     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     public Double batteryVolt;
 
     public void valueFrom(DataV202404 dataV202404, DataCd83Vo cdData) throws Exception{

--
Gitblit v1.8.0