From c3a0cb8e8d8025e3937149b64a604b8989b2de18 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 六月 2025 16:46:24 +0800 Subject: [PATCH] 1、表阀一体机阀门状态命令结果输出与测控一体阀做兼容; 2、虚拟卡状态写入时机进行修改,由原来的阶段写簇变成随时写入。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java index 2a8adb3..03d969b 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java @@ -22,7 +22,7 @@ */ @Data -@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "bindNumber", "findDt", "isOnLine", "protocol", "remarks"}) +@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "bindNumber", "findDt", "isOnLine", "protocol", "protocolVersion", "remarks"}) @HeadRowHeight(30) @ContentRowHeight(20) public class VoController implements BaseEntity { @@ -70,6 +70,10 @@ @ExcelIgnore private String protocol; + @Schema(title = "鍗忚鐗堟湰鍙�") + @ExcelIgnore + private String protocolVersion; + @Schema(title = "澶囨敞") @ExcelIgnore private String remarks; -- Gitblit v1.8.0