From 7f3081da3c0597cfbfc8f0fc4e342c4ceb901f6d Mon Sep 17 00:00:00 2001
From: kong <sunuping1@sina.com>
Date: 星期日, 12 四月 2026 18:04:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpPointsListVo.java |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpPointsListVo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpPointsListVo.java
index ee96cef..18b62d7 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpPointsListVo.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpPointsListVo.java
@@ -4,9 +4,14 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
-@ApiModel("搜索点位Vo")
+@ApiModel("搜索点位结果")
 public class XpPointsListVo {
+
+    @ApiModelProperty("结果类型 1=站点 2=场站")
+    private Integer itemType;
 
     @ApiModelProperty("名称")
     private String name;
@@ -20,24 +25,39 @@
     @ApiModelProperty("经度")
     private Double longitude;
 
-    @ApiModelProperty("距离m")
+    @ApiModelProperty("距离,单位米")
     private Double distance;
 
-    @ApiModelProperty("站点id")
+    @ApiModelProperty("结果id,站点时为point.id,场站时为station.id")
     private Long id;
+
+    @ApiModelProperty("所属场站id,无场站时为空")
+    private Long stationId;
 
     @ApiModelProperty("电子围栏区域id")
     private Long electronicAreaId;
 
-    @ApiModelProperty(value = "运营类型 1=与运营区同步 2=自定义时间段")
+    @ApiModelProperty("运营类型 1=与运营区同步 2=自定义时间段")
     private Integer operationType;
 
+    @ApiModelProperty("是否收藏 1=是 2=否")
+    private Integer isCollect = 2;
+
+    @ApiModelProperty("收藏绑定的点位id,场站收藏时用于落到具体point_id")
+    private Long collectPointId;
+
+    @ApiModelProperty("点位在场站内排序")
+    private Integer stationSortNo;
+
+    @ApiModelProperty("生效周期")
     private Integer effectivePeriod;
 
-
+    @ApiModelProperty("生效时间段")
     private String effectiveTimePeriod;
 
-    private Integer state=1;
+    @ApiModelProperty("状态 1=可用 0=不可用")
+    private Integer state = 1;
 
-
+    @ApiModelProperty("场站子点位列表")
+    private List<XpPointsListVo> children;
 }

--
Gitblit v1.7.1