From 1b77c2724e38d087f3eab4a2f27b3b165f4265dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 14:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/java/com/ruoyi/safety/pojo/SafetyTrainingRecord.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safety/pojo/SafetyTrainingRecord.java b/src/main/java/com/ruoyi/safety/pojo/SafetyTrainingRecord.java
new file mode 100644
index 0000000..aae7257
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/pojo/SafetyTrainingRecord.java
@@ -0,0 +1,38 @@
+package com.ruoyi.safety.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("safety_training_record")
+public class SafetyTrainingRecord extends SafetyBaseEntity {
+
+ private Long planId;
+
+ private Long employeeId;
+
+ private String employeeName;
+
+ private String content;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime completeTime;
+
+ private BigDecimal duration;
+
+ private String method;
+
+ private String result;
+
+ private BigDecimal score;
+
+ private Integer status;
+}
--
Gitblit v1.9.3