From 11e55e11d3d3397cd2b54a65b2cda202be822296 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 30 四月 2026 09:21:54 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi 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