From 4fafee90e483bb10e092186a9b07b8cc356dbdb2 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 11 Jun 2026 14:49:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev

---
 ard-sample/pom.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ard-sample/pom.xml b/ard-sample/pom.xml
index dec4c54..eae7ce1 100644
--- a/ard-sample/pom.xml
+++ b/ard-sample/pom.xml
@@ -32,6 +32,12 @@
         <javax-jaxb.version>2.3.0</javax-jaxb.version>
     </properties>
     <dependencies>
+        <!-- 子模块主动声明,继承主pom中jackson-dataformat-xml的版本,真正引入依赖 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

--
Gitblit v1.9.3