From fdf8c19224d67e94a4404388359db4b4ee348a5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 23:55:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java
index f2dd92a..34c0e8c 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java
@@ -1,8 +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.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
@@ -44,7 +46,8 @@
private Integer distributionRules;
@ApiModelProperty(value = "发放规则json,[]=本券使用后循环发放, [1,2,3]=指定优惠券使用后发放（优惠券id数组）")
- private String distributionAfterUse;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<Long> distributionAfterUse;
@ApiModelProperty(value = "生效规则（1=领取后生效，2=领取后指定日期生效）")
private Integer effectiveRules;
@@ -72,6 +75,7 @@
private Integer repPercent;
@ApiModelProperty(value = "使用时间段,时间字符串,开始和结束用,分割拼接成一个字符串，如果只有结束时间还是需要保持逗号,如:[',05:00:00']")
+ @TableField(typeHandler = JacksonTypeHandler.class)
private List<String> usagePeriod;
@ApiModelProperty(value = "每人限领数量")
--
Gitblit v1.7.1