From dfa9258c8879dbb0d1bfc00d7f939031d0bb623b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 18:32:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
new file mode 100644
index 0000000..0b8d7cd
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
@@ -0,0 +1,26 @@
+package com.ruoyi.safe.dto;
+
+import com.ruoyi.safe.pojo.SafeTraining;
+import com.ruoyi.safe.pojo.SafeTrainingDetails;
+import com.ruoyi.safe.pojo.SafeTrainingFile;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SafeTrainingDto extends SafeTraining {
+
+    @ApiModelProperty("鎶ュ悕浜烘暟")
+    private Integer nums;
+
+    @ApiModelProperty("璇勪环浜�")
+    private String assessmentUserName;
+
+    @ApiModelProperty("闄勪欢闆嗗悎")
+    private List<SafeTrainingFile> safeTrainingFileList;
+
+    @ApiModelProperty("鍩硅璁板綍浜哄憳璇︽儏闆嗗悎")
+    private List<SafeTrainingDetailsDto> safeTrainingDetailsDtoList;
+
+}

--
Gitblit v1.9.3