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-account-boot/src/main/java/com/xiaopeng/account/model/query/XpUserCollectAddrListQuery.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/query/XpUserCollectAddrListQuery.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/query/XpUserCollectAddrListQuery.java
index 277d9fb..92ff110 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/query/XpUserCollectAddrListQuery.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/query/XpUserCollectAddrListQuery.java
@@ -1,11 +1,11 @@
-//package com.xiaopeng.account.model.query;
-//
-//import com.xiaopeng.common.core.web.page.BasePage;
-//import io.swagger.annotations.ApiModel;
-//import lombok.Data;
-//
-//@Data
-//@ApiModel(value = "用户收藏地址列表查询参数")
-//public class XpUserCollectAddrListQuery extends BasePage {
-//
-//}
+package com.xiaopeng.account.model.query;
+
+import com.xiaopeng.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "用户收藏地址列表查询参数")
+public class XpUserCollectAddrListQuery extends BasePage {
+
+}

--
Gitblit v1.7.1