From bb671486066976fa67477ed71d1d424a6ee4e012 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 21:51:33 +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 | 7 +++++++
1 files changed, 7 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 db534ee..c546665 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
@@ -12,6 +12,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -38,6 +39,12 @@
@ApiModelProperty(value = "活动类型 如新人活动、媒体邀约活动、日常提频等")
private Integer activityType;
+ @ApiModelProperty(value = "是否开启活动总限额")
+ private boolean enableTotalLimit;
+
+ @ApiModelProperty(value = "是否开启活动总限额")
+ private BigDecimal totalLimit;
+
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
--
Gitblit v1.7.1