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/model/operation/XpPoint.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
index 1a3a837..fe7a308 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
@@ -167,15 +167,25 @@
@ApiModelProperty(value = "状态描述")
@TableField(exist = false)
private String hoverStatusDes;
- @ApiModelProperty(value = "场站的生效时间")
+ @ApiModelProperty(value = "围栏的生效时间")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime electronicEffectTime;
//[{"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 electronicOperationStrategy;
+ private String stationEffectiveTimePeriod;
}
--
Gitblit v1.7.1