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/AssetRepairRecord.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.java
index d63b2c2..ce2dca4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -32,11 +33,11 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "保修单ID")
+ @ApiModelProperty(value = "报修单ID")
@TableField("repair_request_id")
private Integer repairRequestId;
- @ApiModelProperty(value = "报修单号")
+ @ApiModelProperty(value = "维修单号")
@TableField("repair_no")
private String repairNo;
@@ -66,7 +67,11 @@
@ApiModelProperty(value = "报修状态：0-维修中，1-无需维修，2-维修完成")
@TableField("repair_status")
- private Boolean repairStatus;
+ private Integer repairStatus;
+
+ @ApiModelProperty(value = "维修费用")
+ @TableField("total_fee")
+ private BigDecimal totalFee;
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
--
Gitblit v1.7.1