Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-28 d76f8e3b59969d4bf0f1bf4c92730719bd5389d3

 ard-route/src/main/java/com/ard/route/domain/djuav/kml/KmlFolder.java

@@ -1,5 +1,6 @@
package com.ard.route.domain.djuav.kml;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import lombok.Data;
@@ -8,6 +9,7 @@

@Data
@XStreamAlias("Folder")
@JsonInclude(JsonInclude.Include.NON_NULL)
public class KmlFolder {
    @XStreamAlias("wpml:templateType")
    private String templateType;