From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 15:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRequest.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRequest.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRequest.java
index 5cf751a..4054dd6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRequest.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRequest.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -46,6 +48,7 @@
@ApiModelProperty(value = "报修时间")
@TableField("report_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime reportTime;
@ApiModelProperty(value = "报修资产类型ID")
@@ -54,10 +57,12 @@
@ApiModelProperty(value = "紧急程度：0-高、1-中、2-低")
@TableField("urgency_level")
- private Boolean urgencyLevel;
+ private Integer urgencyLevel;
@ApiModelProperty(value = "期望维修时间")
@TableField("expected_repair_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+
private LocalDateTime expectedRepairTime;
@ApiModelProperty(value = "报修内容")
@@ -94,6 +99,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
+ @TableLogic
private Boolean disabled;
--
Gitblit v1.7.1