Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-04-26 2aa8fe3c4cb92c83ba886f0d08b76e98f0dc4de6

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpActicityService.java

@@ -4,6 +4,7 @@
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;
@@ -18,7 +19,7 @@
 */
public interface IXpActicityService extends IService<XpActivity> {

    PageInfo<XpActivity> pageList(XpActivityPageListQuery query);
    PageInfo<XpActivityDto> pageList(XpActivityPageListQuery query);

    List<String> findListToIds(String acticityName);