From 7aab004601e77890b158f19d1735594a8326feaa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 17:11:17 +0800
Subject: [PATCH] 数据库事务注解位置调整

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 e79a49d..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
@@ -9,8 +9,9 @@
 @EqualsAndHashCode(callSuper=false)
 public class DataCd84Vo extends AlarmVo {
 
-	public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�02锛�0x02锛�:琛ㄩ榾涓�浣撴満锛�57(0x57):浜曠數鎺у埗鍣�
+	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