From 320e7cd68a368a666986019e29c4af0fc9ddaa48 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 12 四月 2026 20:13:21 +0800
Subject: [PATCH] 处理冲突

---
 xp-robotaxi-api/pom.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/pom.xml b/xp-robotaxi-api/pom.xml
index bfa238b..fffc9d8 100644
--- a/xp-robotaxi-api/pom.xml
+++ b/xp-robotaxi-api/pom.xml
@@ -57,6 +57,12 @@
             <artifactId>protobuf-java</artifactId>
             <version>3.19.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+            <version>1.5.1-RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

--
Gitblit v1.7.1