From bde8f17cf5037e6c6e9ffe63704df42a81b90f75 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 四月 2026 00:37:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/XpActivityPageListQuery.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/XpActivityPageListQuery.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/XpActivityPageListQuery.java
index ecb04f2..884e45f 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/XpActivityPageListQuery.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/XpActivityPageListQuery.java
@@ -32,6 +32,9 @@
     @ApiModelProperty(value = "活动名称")
     private String acticityName;
 
+    @ApiModelProperty(value = "活动类型 如新人活动、媒体邀约活动、日常提频等")
+    private Integer activityType;
+
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;

--
Gitblit v1.7.1