From 0ee340a21c1061cb68eb124ab26b482552634dba Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 23 十月 2024 20:23:22 +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 | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 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 65dc623..c556bf8 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,9 +1,8 @@ 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 @@ -13,18 +12,46 @@ */ @Data +@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned"}) public class VoUnclosedValve implements BaseEntity { private static final long serialVersionUID = 202405241634001L; - private String commandCode; + //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 openTime; } -- Gitblit v1.8.0