From 4c5d99fd2e9c264ebf7cfb532fae430fb6f7f66b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 29 四月 2026 20:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivityNotice.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivityNotice.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivityNotice.java
index eb64e71..c9ef1de 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivityNotice.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivityNotice.java
@@ -66,9 +66,9 @@
private List<String> blockTime;
@ApiModelProperty(value = "miniProgram临近到期toast")
- private Integer toastBeforeExpiry;
+ private String toastBeforeExpiry;
@ApiModelProperty(value = "miniProgram临近生效toast")
- private Integer toastBeforeEffective;
+ private String toastBeforeEffective;
@ApiModelProperty(value = "是否开启浮窗")
private Boolean enableFloatingWindow;
@ApiModelProperty(value = "浮窗优先级权重1-100")
--
Gitblit v1.7.1