From d76f8e3b59969d4bf0f1bf4c92730719bd5389d3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 28 Nov 2025 16:54:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
index b4d6eb9..8896dd0 100644
--- a/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
+++ b/ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlOverlap.java
@@ -1,34 +1,36 @@
package com.ard.route.domain.djuav.kml;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@Data
@XStreamAlias("wpml:overlap")
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlOverlap {
- @XStreamAlias("orthoLidarOverlapH")
+ @XStreamAlias("wpml:orthoLidarOverlapH")
private String orthoLidarOverlapH;
- @XStreamAlias("orthoLidarOverlapW")
+ @XStreamAlias("wpml:orthoLidarOverlapW")
private String orthoLidarOverlapW;
- @XStreamAlias("orthoCameraOverlapH")
+ @XStreamAlias("wpml:orthoCameraOverlapH")
private String orthoCameraOverlapH;
- @XStreamAlias("orthoCameraOverlapW")
+ @XStreamAlias("wpml:orthoCameraOverlapW")
private String orthoCameraOverlapW;
- @XStreamAlias("inclinedLidarOverlapH")
+ @XStreamAlias("wpml:inclinedLidarOverlapH")
private String inclinedLidarOverlapH;
- @XStreamAlias("inclinedLidarOverlapW")
+ @XStreamAlias("wpml:inclinedLidarOverlapW")
private String inclinedLidarOverlapW;
- @XStreamAlias("inclinedCameraOverlapH")
+ @XStreamAlias("wpml:inclinedCameraOverlapH")
private String inclinedCameraOverlapH;
- @XStreamAlias("inclinedCameraOverlapW")
+ @XStreamAlias("wpml:inclinedCameraOverlapW")
private String inclinedCameraOverlapW;
}
--
Gitblit v1.9.3