From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpCruiseCheckInRule.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpCruiseCheckInRule.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpCruiseCheckInRule.java
index 9ea9498..8334a60 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpCruiseCheckInRule.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpCruiseCheckInRule.java
@@ -4,6 +4,7 @@
 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.ApiModelProperty;
 import lombok.Data;
@@ -34,18 +35,20 @@
      */
     @TableField("operations_user_id")
     @ApiModelProperty(value = "运维人id")
-    private Long operationsUserId;
+    private String operationsUserId;
     /**
      * 任务开始时间
      */
     @TableField("start_time")
     @ApiModelProperty(value = "任务开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
     /**
      * 任务结束时间
      */
     @TableField("end_time")
     @ApiModelProperty(value = "任务结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
     /**
      * 循环方式(0=不循环,1=每天循环)

--
Gitblit v1.7.1