From ff3d35c172c5cf5f3ebf8ed710643f8038c3675b Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 07 五月 2025 11:27:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
index b7bace9..83be31a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
@@ -11,6 +11,7 @@
public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿
+ public Byte opType;
public String openDt;//寮�娉�/闃�鏃堕棿(yyyy-mm-dd HH:MM:SS)
public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
@@ -19,6 +20,7 @@
public Double eleTotalAmount ;//鐢佃〃绱鐢甸噺锛屽崟浣�0.01搴�
public Double moneyRemainUser ;//鐢ㄦ埛鍓╀綑閲戦锛� 鍗曚綅0.01鍏�
public Double waterRemainUser ;//鐢ㄦ埛鍓╀綑姘撮噺锛� 鍗曚綅0.01m3
+ public Double price ;//姘翠环
public String comName ;//鍛戒护鍚嶇О
@@ -35,6 +37,9 @@
sb.append(" 椤圭洰缂栧彿 : ") ;
sb.append(projectNo == null?"鏈煡":projectNo) ;
sb.append("\n") ;
+ sb.append(" 寮�闃�绫诲瀷锛�");
+ sb.append(opType==null?"鏈煡": CommonV202404.openValveType(opType));
+ sb.append("\n");
sb.append(" IC鍗″湴鍧� : ") ;
sb.append(icCardAddr == null?"鏈煡":icCardAddr) ;
sb.append("\n") ;
@@ -59,6 +64,9 @@
sb.append(" 鐢ㄦ埛鍓╀綑姘撮噺 : ") ;
sb.append(waterRemainUser == null?"鏈煡":waterRemainUser) ;
sb.append("\n") ;
+ sb.append(" 姘翠环 : ") ;
+ sb.append(price == null?"鏈煡":price) ;
+ sb.append("\n") ;
return sb.toString() + super.toString() ;
}
--
Gitblit v1.8.0