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 | 4 ++-- 1 files changed, 2 insertions(+), 2 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 42b6d44..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 @@ -33,7 +33,7 @@ @TableId(value = "id", type = IdType.AUTO) private Integer id; - @ApiModelProperty(value = "保修单ID") + @ApiModelProperty(value = "报修单ID") @TableField("repair_request_id") private Integer repairRequestId; @@ -67,7 +67,7 @@ @ApiModelProperty(value = "报修状态:0-维修中,1-无需维修,2-维修完成") @TableField("repair_status") - private Boolean repairStatus; + private Integer repairStatus; @ApiModelProperty(value = "维修费用") @TableField("total_fee") -- Gitblit v1.7.1