From c095cf1ef192a1ac4cfd1868bdf70de2b340a2f5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 18 四月 2026 15:51:40 +0800
Subject: [PATCH] resolve conflict

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpActicityService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpActicityService.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpActicityService.java
index 636ee4c..49c64fc 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpActicityService.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpActicityService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xiaopeng.api.model.operation.XpActicity;
 
+import java.util.List;
+
 /**
  * <p>
  * 活动管理 服务类
@@ -13,4 +15,6 @@
  */
 public interface IXpActicityService extends IService<XpActicity> {
 
+
+    List<String> findListToIds(String acticityName);
 }

--
Gitblit v1.7.1