From dbd7fd484b5c7ed00cb895f227645848c3677c08 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
index 87c559e..482d197 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("safe_training_file")
-@ApiModel(value = "SafeTrainingFile瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
+@Schema(name = "SafeTrainingFile瀵硅薄", description = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
public class SafeTrainingFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,7 +30,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍏宠仈瀹夊叏鍩硅鑰冩牳id")
+ @Schema(description = "鍏宠仈瀹夊叏鍩硅鑰冩牳id")
private Integer safeTrainingId;
private String name;
--
Gitblit v1.9.3