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/XpActicityUser.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityUser.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityUser.java
index 5c176e3..bc0c420 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityUser.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityUser.java
@@ -2,14 +2,18 @@
 
 import com.alibaba.fastjson2.JSONArray;
 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.xiaopeng.common.core.web.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import java.util.List;
 
 /**
  * <p>
@@ -42,7 +46,8 @@
     private Integer userType;
 
     @ApiModelProperty(value = "指定用户json数组")
-    private JSONArray userList;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Long> userList;
 
     @ApiModelProperty(value = "策略组名称")
     private String strategyName;

--
Gitblit v1.7.1