From f5560820431163db68ccea4c850fb90a0eebf467 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:42:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
index 0ce0585..38538d4 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java
@@ -36,6 +36,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;
@@ -62,4 +65,7 @@
@ApiModelProperty(value = "图片")
private String img;
+ @ApiModelProperty(value = "富文本内容")
+ private String richText;
+
}
--
Gitblit v1.7.1