From 2aa8fe3c4cb92c83ba886f0d08b76e98f0dc4de6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 26 四月 2026 10:16:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/mapper/XpActicityMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/mapper/XpActicityMapper.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/mapper/XpActicityMapper.java
index 7c7d435..9829fa8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/mapper/XpActicityMapper.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/mapper/XpActicityMapper.java
@@ -1,8 +1,10 @@
package com.xiaopeng.operation.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xiaopeng.api.dto.operation.XpActivityDto;
import com.xiaopeng.api.model.operation.XpActivity;
import com.xiaopeng.api.query.operation.XpActivityPageListQuery;
+import com.xiaopeng.api.vo.operation.XpActivityVo;
import com.xiaopeng.common.core.web.page.PageInfo;
import java.util.List;
@@ -17,5 +19,5 @@
*/
public interface XpActicityMapper extends BaseMapper<XpActivity> {
- List<XpActivity> pageList(PageInfo<XpActivity> pageInfo, XpActivityPageListQuery query);
+ List<XpActivityDto> pageList(PageInfo<XpActivityDto> pageInfo, XpActivityPageListQuery query);
}
--
Gitblit v1.7.1