From 8bf1d8f1cfcdbda64b2a80653a3ee10d31b69108 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 12 四月 2026 18:55:26 +0800
Subject: [PATCH] 合并代码处理冲突

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
index b8dfd28..c469ab6 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
@@ -26,7 +26,7 @@
 @Accessors(chain = true)
 @TableName("xp_point")
 @ApiModel(value="XpPoint对象", description="点位管理")
-public class XpPoint extends c {
+public class XpPoint extends BaseModel {
 
     private static final long serialVersionUID = 1L;
 

--
Gitblit v1.7.1