From 171439bcb3b5e4a636bbb81a93d61396f6e2940e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 17 二月 2025 17:32:09 +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/voAllRound/VoArIntakeBase.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeBase.java
similarity index 79%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeBase.java
index 798ae3f..0d0f17f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeBase.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeBase.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrGlobal.VoAllRound;
+package com.dy.pipIrrGlobal.voAllRound;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
@@ -12,7 +12,7 @@
*/
@Data
-@JsonPropertyOrder({"id", "num", "lng","lat", "blockName", "rtuAddr"})
+@JsonPropertyOrder({"id", "num", "lng","lat", "address", "blockName", "rtuAddr"})
public class VoArIntakeBase {
private static final long serialVersionUID = 202501141601001L;
@@ -35,6 +35,11 @@
public Double lat;
/**
+ * 鍦板潃(鍘�+闀�+鏉�)
+ */
+ public String address ;
+
+ /**
* 鐗囧尯
*/
public String blockName;
--
Gitblit v1.8.0