From 487bed3eba27a1f6621c43b7fab5c82468fa2bc9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:26:44 +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/voRm/VoUnclosedValve.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 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 da4c9c2..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
@@ -1,7 +1,10 @@
 package com.dy.pipIrrGlobal.voRm;
 
 import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * @author ZhuBaoMin
@@ -11,20 +14,54 @@
  */
 
 @Data
+@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned", "dt", "waterInstant"})
 public class VoUnclosedValve implements BaseEntity {
     private static final long serialVersionUID = 202405241634001L;
 
     //private String commandCode;
 
+    /**
+     * 鍙栨按鍙g紪鍙�
+     */
     private String intakeNum;
 
+    /**
+     * 鏄惁鍦ㄧ嚎
+     */
     private Boolean isOnLine;
 
+    /**
+     * 闃�鎺у櫒鍦板潃
+     */
     private String rtuAddr;
 
-    private String orderNo;
-
+    /**
+     * 铏氭嫙鍗$紪鍙�
+     */
     private String vcNum;
 
-    //private Date openTime;
+    /**
+     * 璁㈠崟鍙�
+     */
+    private String orderNo;
+
+    /**
+     * 鐘舵��
+     */
+    private String state;
+
+    /**
+     * 鏄惁璁″垝鎬у紑闃�
+     */
+    private Boolean planned;
+
+    /**
+     * 宸ヤ綔鎶ユ椂闂�
+     */
+    private Date dt;
+
+    /**
+     * 鐬椂娴侀噺
+     */
+    private Double waterInstant;
 }

--
Gitblit v1.8.0