From 92ff484325b9af3afd081ec079f74fbc6dd3fea8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 15:43:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java
index f3f1904..89cc52b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java
@@ -36,6 +36,9 @@
     @ApiModelProperty(value = "维修资产类型ID")
     private Integer assetTypeId;
 
+    @ApiModelProperty(value = "资产类型")
+    private String assetTypeName;
+
     @ApiModelProperty(value = "维修开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime repairTime;
@@ -58,6 +61,9 @@
     @ApiModelProperty(value = "关联报修单ID")
     private Integer repairRequestId;
 
+    @ApiModelProperty(value = "关联报修单编号")
+    private String repairRequestNo;
+
     @ApiModelProperty(value = "维修资产列表")
     private List<AssetRepairRecordAssetVO> assetList;
 

--
Gitblit v1.7.1