From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:35:16 +0800 Subject: [PATCH] Revert "1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。" --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java index 311d47f..7d09b66 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java @@ -15,7 +15,7 @@ * @Description */ @Data -@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address"}) +@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address", "rtuAddr", "protocol"}) public class VoAllIntake implements BaseEntity { private static final long serialVersionUID = 202412161003001L; @@ -95,4 +95,14 @@ * 鍦板潃 */ private String address; + + /** + * RTU鍦板潃 + */ + private String rtuAddr; + + /** + * 閫氳鍗忚 + */ + private String protocol; } -- Gitblit v1.8.0