From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordAssetVO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordAssetVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordAssetVO.java
index 5b54ffe..69a46c1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordAssetVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordAssetVO.java
@@ -7,7 +7,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
/**
* <p>
@@ -45,12 +45,12 @@
private String assetStatus;
@ApiModelProperty(value = "维修完成时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime repairFinishTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate repairFinishTime;
@ApiModelProperty(value = "维修花费")
private BigDecimal repairFee;
- @ApiModelProperty(value = "维修状态")
+ @ApiModelProperty(value = "维修状态：0-维修中，1-维修完成")
private Integer status;
}
\ No newline at end of file
--
Gitblit v1.7.1