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/XpWorkOrderLog.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrderLog.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrderLog.java
index 14f7f81..1242159 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrderLog.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrderLog.java
@@ -1,5 +1,6 @@
package com.xiaopeng.api.model.maintenance;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,6 +13,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* <p>
@@ -31,7 +33,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "自增id")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
@ApiModelProperty(value = "工单id")
@@ -42,11 +44,19 @@
@ApiModelProperty(value = "所属处理人id")
private Long handleUserId;
+ @ApiModelProperty(value = "所属处理人名称")
+ @TableField(exist = false)
+ private String handleUserName;
+ @ApiModelProperty(value = "所属处理人touxiang")
+ @TableField(exist = false)
+ private String handleUserAvatar;
+
@ApiModelProperty(value = "操作类型 1移交 2办结")
- private String handleType;
+ private Integer handleType;
@ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime handleTime;
@ApiModelProperty(value = "处理文件")
--
Gitblit v1.7.1