From 95d8e5f4348497b1eee5884086534c86b1661b4f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 十月 2025 19:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 c12e603..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
@@ -33,11 +33,11 @@
@ApiModelProperty(value = "事项标题")
private String title;
- @ApiModelProperty(value = "维修资产类型")
- private String assetTypeName;
+ @ApiModelProperty(value = "维修资产类型ID")
+ private Integer assetTypeId;
- @ApiModelProperty(value = "维修资产一级类型")
- private String assetTypeFirstLevel;
+ @ApiModelProperty(value = "资产类型")
+ private String assetTypeName;
@ApiModelProperty(value = "维修开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -61,6 +61,9 @@
@ApiModelProperty(value = "关联报修单ID")
private Integer repairRequestId;
+ @ApiModelProperty(value = "关联报修单编号")
+ private String repairRequestNo;
+
@ApiModelProperty(value = "维修资产列表")
private List<AssetRepairRecordAssetVO> assetList;
--
Gitblit v1.7.1