From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 15 十月 2025 15:27:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java | 8 ++++---- 1 files changed, 4 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..12eb5f0 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") -- Gitblit v1.7.1