From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
index c556bf8..beca40c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
@@ -4,6 +4,8 @@
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+import java.util.Date;
+
/**
* @author ZhuBaoMin
* @date 2024-05-24 16:30
@@ -12,7 +14,7 @@
*/
@Data
-@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned"})
+@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned", "dt", "waterInstant"})
public class VoUnclosedValve implements BaseEntity {
private static final long serialVersionUID = 202405241634001L;
@@ -53,5 +55,13 @@
*/
private Boolean planned;
- //private Date openTime;
+ /**
+ * 宸ヤ綔鎶ユ椂闂�
+ */
+ private Date dt;
+
+ /**
+ * 鐬椂娴侀噺
+ */
+ private Double waterInstant;
}
--
Gitblit v1.8.0