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/mapper/XpAppUserCollectAddrMapper.java | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/mapper/XpAppUserCollectAddrMapper.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/mapper/XpAppUserCollectAddrMapper.java
index 154f5bd..7b35c32 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/mapper/XpAppUserCollectAddrMapper.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/mapper/XpAppUserCollectAddrMapper.java
@@ -1,21 +1,26 @@
-//package com.xiaopeng.account.mapper;
-//
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.xiaopeng.account.model.query.XpUserCollectAddrListQuery;
-//import com.xiaopeng.account.model.vo.XpAppUserCollectAddrVO;
-//import com.xiaopeng.api.model.account.XpAppUserCollectAddr;
-//import org.apache.ibatis.annotations.Param;
-//
-//
-///**
-// * <p>
-// * 用户收藏地址Mapper 接口
-// * </p>
-// *
-// * @author mitao
-// * @since 2026-02-03
-// */
-//public interface XpAppUserCollectAddrMapper extends BaseMapper<XpAppUserCollectAddr> {
-// Page<XpAppUserCollectAddrVO> userCollectAddrPageList(@Param("page") Page<XpAppUserCollectAddrVO> page, @Param("query") XpUserCollectAddrListQuery query, @Param("uid") Long uid);
-//}
+package com.xiaopeng.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xiaopeng.account.model.query.XpUserCollectAddrListQuery;
+import com.xiaopeng.account.model.vo.CollectAddrTargetVO;
+import com.xiaopeng.account.model.vo.XpAppUserCollectAddrVO;
+import com.xiaopeng.api.model.account.XpAppUserCollectAddr;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 用户收藏地址Mapper 接口
+ * </p>
+ *
+ * @author mitao
+ * @since 2026-02-03
+ */
+public interface XpAppUserCollectAddrMapper extends BaseMapper<XpAppUserCollectAddr> {
+ Page<XpAppUserCollectAddrVO> userCollectAddrPageList(@Param("page") Page<XpAppUserCollectAddrVO> page, @Param("query") XpUserCollectAddrListQuery query, @Param("uid") Long uid);
+
+ CollectAddrTargetVO selectPointCollectTarget(@Param("pointId") Long pointId);
+
+ CollectAddrTargetVO selectStationCollectTarget(@Param("stationId") Long stationId);
+}
--
Gitblit v1.7.1