From a1a7bb5093d30397078ce42ef025cd07378d1e1c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 15:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 6 +++---
1 files changed, 3 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..34b3086 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -1,15 +1,15 @@
package com.ruoyi.device.dto;
import com.ruoyi.device.pojo.DeviceRepair;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class DeviceRepairDto extends DeviceRepair {
- @ApiModelProperty("鎶ヤ慨鏃堕棿瀛楃涓�")
+ @Schema(description = "鎶ヤ慨鏃堕棿瀛楃涓�")
private String repairTimeStr;
- @ApiModelProperty("缁翠慨鏃堕棿瀛楃涓�")
+ @Schema(description = "缁翠慨鏃堕棿瀛楃涓�")
private String maintenanceTimeStr;
}
--
Gitblit v1.9.3