From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
index a53ea3d..825b4ad 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
@@ -1,22 +1,18 @@
 package com.ruoyi.safe.pojo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 
 /**
  * <p>
@@ -92,4 +88,7 @@
     @ApiModelProperty("澶囨敞")
     @TableField(exist = false)
     private String remarks;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3