From 1e6561acc89b7105c1dcbf5395845d6046f1453d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 16:55:09 +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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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 d1b8e04..5602415 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
@@ -1,13 +1,15 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
import lombok.Data;
+import lombok.EqualsAndHashCode;
//鍒峰崱寮�娉�/闃�涓婃姤
@Data
+@EqualsAndHashCode(callSuper=false)
public class DataCd84Vo extends AlarmVo {
public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
- public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+ public Integer projectNo ;//椤圭洰缂栧彿
public String openDt;//寮�娉�/闃�鏃堕棿(yyyy-mm-dd HH:MM:SS)
public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
@@ -42,7 +44,7 @@
sb.append(orderNo == null?"鏈煡":orderNo) ;
sb.append("\n") ;
sb.append(" 寮�娉�/闃�鏃堕棿 : ") ;
- sb.append(openDt == null?"鏈煡": openDt) ;
+ sb.append(openDt == null?"鏈煡":openDt) ;
sb.append("\n") ;
sb.append(" 姘磋〃绱姘撮噺 : ") ;
sb.append(waterTotalAmount == null?"鏈煡":waterTotalAmount) ;
--
Gitblit v1.8.0