From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 4ab8513..12def24 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -1,15 +1,20 @@
package com.ruoyi.device.dto;
+import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.device.pojo.DeviceRepair;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+
+import java.util.List;
@Data
public class DeviceRepairDto extends DeviceRepair {
- @ApiModelProperty("鎶ヤ慨鏃堕棿瀛楃涓�")
+ @Schema(description = "鎶ヤ慨鏃堕棿瀛楃涓�")
private String repairTimeStr;
- @ApiModelProperty("缁翠慨鏃堕棿瀛楃涓�")
+ @Schema(description = "缁翠慨鏃堕棿瀛楃涓�")
private String maintenanceTimeStr;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
}
--
Gitblit v1.9.3