From 4f6a3c11ad13c1182b6db3e7d9a47d50c828b7e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 五月 2025 15:14:42 +0800
Subject: [PATCH] 完善pipIrr-param-set模块配置文件

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java |    8 +++++++-
 1 files changed, 7 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 7d09b66..adea005 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", "rtuAddr", "protocol"})
+@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address", "controllerId", "rtuAddr", "protocol"})
 public class VoAllIntake implements BaseEntity {
     private static final long serialVersionUID = 202412161003001L;
 
@@ -97,6 +97,12 @@
     private String address;
 
     /**
+     * 闃�鎺у櫒ID
+     */
+    @JSONField(serializeUsing = ObjectWriterImplToString.class)
+    private Long controllerId;
+
+    /**
      * RTU鍦板潃
      */
     private String rtuAddr;

--
Gitblit v1.8.0