From dcfc005ee387ac39de83bd4637f48ed0f8f6c9a9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 16:23:03 +0800 Subject: [PATCH] 1、修改文档“增加一个单位(orgTa)”名称; 2、config.properties配置改为ym的配置; 3、江海用测试系统调整,适应阿里云服务器环境。 --- 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