From 19787c0b4f5f29026c1790bbb043b9186cdd0e11 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 四月 2026 14:52:16 +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 | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 2cd5a1d..a5743c2 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
@@ -1,5 +1,6 @@
package com.xiaopeng.api.vo.order;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -37,8 +38,6 @@
@ApiModelProperty("电子围栏区域id")
private Long electronicAreaId;
- @ApiModelProperty("运营类型 1=与运营区同步 2=自定义时间段")
- private Integer operationType;
@ApiModelProperty("是否收藏 1=是 2=否")
private Integer isCollect = 2;
@@ -49,6 +48,8 @@
@ApiModelProperty("点位在场站内排序")
private Integer stationSortNo;
+ @ApiModelProperty("运营类型 1=与运营区同步 2=自定义时间段")
+ private Integer operationType;
@ApiModelProperty("生效周期")
private Integer effectivePeriod;
@@ -61,6 +62,22 @@
@ApiModelProperty(value = "停车时长")
private Integer time;
+
+ //[{"name": "策略组1", "time": ["04:00-10:00", "14:00-23:00"], "type": 0, "typeStr": []}]
+ @ApiModelProperty(value = "围栏运营策略")
+ @TableField(exist = false)
+ private String fenceOperationStrategy;
+
+ @ApiModelProperty(value = "场站运营类型 1=与运营区同步 2=自定义时间段")
+ @TableField(exist = false)
+ private Integer stationOperationType;
+ @ApiModelProperty(value = "生效周期 1=每日 2=仅工作日 3=仅非工作日 4=仅节假日")
+ @TableField(exist = false)
+ private Integer stationEffectivePeriod;
+ @ApiModelProperty(value = "场站运营策略")
+ @TableField(exist = false)
+ private String stationEffectiveTimePeriod;
+
@ApiModelProperty("场站子点位列表")
private List<XpPointsListVo> children;
}
--
Gitblit v1.7.1