From 60afc1c228318d136a273cd0b389217f87583277 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 11 十月 2025 11:29:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecordItem.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecordItem.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecordItem.java index 3d56f2a..98f6aa5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecordItem.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecordItem.java @@ -10,6 +10,8 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; /** * <p> @@ -39,5 +41,17 @@ @TableField("asset_main_id") private Integer assetMainId; + @ApiModelProperty(value = "维修完成时间") + @TableField("repair_finish_time") + private LocalDateTime repairFinishTime; + + @ApiModelProperty(value = "维修花费" ) + @TableField("repair_fee") + private BigDecimal repairFee; + + @ApiModelProperty(value = "维修状态:0-维修中,1-维修完成") + @TableField("status") + private Integer status; + } -- Gitblit v1.7.1