From 6da3cde42c90fa5383cf1b48e632cb1107c80d3e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 25 四月 2026 07:27:16 +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/XpActicityUser.java |    3 ++-
 1 files changed, 2 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 4108afc..5c176e3 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
@@ -1,5 +1,6 @@
 package com.xiaopeng.api.model.operation;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -41,7 +42,7 @@
     private Integer userType;
 
     @ApiModelProperty(value = "指定用户json数组")
-    private String userList;
+    private JSONArray userList;
 
     @ApiModelProperty(value = "策略组名称")
     private String strategyName;

--
Gitblit v1.7.1