From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java
index 72aad19..ea3d9ec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
@@ -90,9 +92,9 @@
private String handlePerson;
@ApiModelProperty(value = "处理时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("handle_time")
- private LocalDateTime handleTime;
+ private LocalDate handleTime;
@ApiModelProperty(value = "结果描述")
@TableField("result_describe")
@@ -109,6 +111,9 @@
@ApiModelProperty(value = "附件名称 逗号分割")
@TableField("attachment_name")
private String attachmentName;
+ @ApiModelProperty(value = "维修单号")
+ @TableField("code")
+ private String code;
@ApiModelProperty(value = "状态 1=待处理 2=已处理")
@TableField("status")
--
Gitblit v1.7.1