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/XpActivity.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 0cc0f22..a927c4d 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xiaopeng.api.vo.account.CouponVo;
import com.xiaopeng.common.core.web.domain.BaseModel;
@@ -50,7 +51,7 @@
private BigDecimal limitation;
@ApiModelProperty(value = "封面图片json")
- private JSONObject coverImage;
+ private String coverImage;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -98,9 +99,9 @@
@ApiModelProperty("短信通知临近券生效前X分钟通知")
private Integer smsActicityStartMinutes;
@ApiModelProperty("短信通知屏蔽开始时间")
- private LocalDateTime smsStartBlockingTime;
+ private String smsStartBlockingTime;
@ApiModelProperty("短信通知屏蔽结束时间")
- private LocalDateTime smsEndBlockingTime;
+ private String smsEndBlockingTime;
@ApiModelProperty("小程序弹窗通知（0=否，1=是）")
private Integer miniProgramNotification;
@ApiModelProperty("小程序弹窗标题")
--
Gitblit v1.7.1