From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
index f1817fc..686e1af 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
@@ -10,8 +10,8 @@
 @Data
 public class VoClientConsumeStatistics {
     public Long clientId ;
-    public Double water;//鐢ㄦ按閲忥紙m3锛�
-    public Double amount;//鑺辫垂閲戦(鎵h垂)锛堝厓锛�
+    public Double amount;//鐢ㄦ按閲忥紙m3锛�
+    public Double money;//鑺辫垂閲戦(鎵h垂)锛堝厓锛�
     public Integer duration; //鏃堕暱(鍒嗛挓)
     public Integer times;//鐢ㄦ按娆℃暟
 }

--
Gitblit v1.8.0