From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +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 | 11 +++++------
1 files changed, 5 insertions(+), 6 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 567b761..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
@@ -1,9 +1,10 @@
package com.xiaopeng.api.model.operation;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,8 +14,6 @@
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
import java.util.List;
/**
@@ -63,13 +62,13 @@
@ApiModelProperty(value = "miniProgram临近生效分钟数")
private Integer miniProgramBeforeEffective;
@ApiModelProperty(value = "屏蔽时间段,时间字符串,开始和结束用,分割拼接成一个字符串，如果只有结束时间还是需要保持逗号,如:[',2007-05-03 05:00:00']")
+ @TableField(typeHandler = JacksonTypeHandler.class)
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