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/operation/XpStationVo.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/XpStationVo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/XpStationVo.java
index 568663f..2d20b9d 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/XpStationVo.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/XpStationVo.java
@@ -1,10 +1,12 @@
 package com.xiaopeng.api.vo.operation;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xiaopeng.api.model.operation.XpPoint;
 import com.xiaopeng.api.model.operation.XpStation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -16,4 +18,19 @@
     private List<XpPoint> xpPointList;
 
 
+
+    @ApiModelProperty(value = "生效类型 1=立即生效 2=定时生效")
+    private Integer fenceEffectType;
+
+    @ApiModelProperty(value = "生效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime fenceEffectTime;
+
+    @ApiModelProperty(value = "失效类型 1=永不失效 2=定时失效")
+    private Integer fenceFailureType;
+
+    @ApiModelProperty(value = "失效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime fenceFailureTime;
+
 }

--
Gitblit v1.7.1