From 76660dd82cc2a5c090391680a38022c82140fad6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 二月 2026 18:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpSystemSetting.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpSystemSetting.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpSystemSetting.java
index 95e6073..3f5af6f 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpSystemSetting.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpSystemSetting.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
/**
* <p>
@@ -21,7 +24,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("xp_system_setting")
-@ApiModel(value="XpSystemSetting对象", description="系统设置表")
+@ApiModel(value = "XpSystemSetting对象", description = "系统设置表")
public class XpSystemSetting extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -43,24 +46,34 @@
private Integer minOrderDistance;
@ApiModelProperty(value = "到达目的地后X分钟后自动结束行程")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("arrive_time")
private Integer arriveTime;
-
-
@ApiModelProperty(value = "常见问题首页展示数")
@TableField("head_show_count")
private Integer headShowCount;
-
@ApiModelProperty(value = "附近站点距离")
@TableField("near_point_distance")
private Integer nearPointDistance;
-
@ApiModelProperty(value = "吸附距离")
@TableField("adsorption_distance")
private Integer adsorptionDistance;
+ @ApiModelProperty(value = "热修复状态 0-关闭 1-开始")
+ @TableField("hotfix_status")
+ private Integer hotfixStatus;
+
+ @ApiModelProperty(value = "热修复开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("hotfix_start_time")
+ private LocalDateTime hotfixStartTime;
+
+ @ApiModelProperty(value = "热修复结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("hotfix_end_time")
+ private LocalDateTime hotfixEndTime;
}
--
Gitblit v1.7.1