From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java b/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
index aa1e0aa..e7d1602 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
@@ -1,14 +1,14 @@
package com.ruoyi.device.dto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class DeviceDefectRecordDto extends DeviceDefectRecord {
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("璁惧鍨嬪彿")
+ @Schema(description = "璁惧鍨嬪彿")
private String deviceModel;
}
--
Gitblit v1.9.3