From 117a9c1d9415ff1fdc069afbcf39ceb4ae1dfc12 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 25 二月 2026 18:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrder.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrder.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrder.java
index 4bc8563..b0f5c18 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrder.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrder.java
@@ -1,10 +1,12 @@
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;
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.List;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
@@ -51,15 +53,24 @@
@ApiModelProperty(value = "类型id")
private Long feedbackTypeId;
+ @ApiModelProperty(value = "类型id")
+ private String feedbackTypeName;
@ApiModelProperty(value = "优先级 1低 2中 3高")
private Integer priority;
@ApiModelProperty(value = "处理状态 1待处理 2处理中 3已处理")
private Integer handleStatus;
-
+ @ApiModelProperty(value = "如果状态为待处理或者处理中 是否可以处理 0否 1是")
+ private Integer isHandle;
@ApiModelProperty(value = "处理人id")
private Long handleUserId;
+ @ApiModelProperty(value = "处理人名称")
+ @TableField(exist = false)
+ private String handleUserName;
+ @ApiModelProperty(value = "处理日志")
+ @TableField(exist = false)
+ private List<XpWorkOrderLog> workOrderLogs;
}
--
Gitblit v1.7.1