From 5fefff8c747cbf5d526f6108a215bd813ac36034 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 六月 2025 13:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 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