From 94e23a3d587846f10ea9517bd2e6705093d6a99a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 17:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java | 88 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 88 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
new file mode 100644
index 0000000..45ff844
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
@@ -0,0 +1,88 @@
+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.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@Getter
+@Setter
+@TableName("safe_hazard_record")
+@ApiModel(value = "SafeHazardRecord瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+public class SafeHazardRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍗曞彿")
+ private String materialRecordCode;
+
+ @ApiModelProperty("鍏宠仈鍗遍櫓婧愬彴璐� ID")
+ private Integer safeHazardId;
+
+ @ApiModelProperty("棰嗙敤浜� ID")
+ private Integer applyUserId;
+
+ @ApiModelProperty("棰嗙敤鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate applyTime;
+
+ @ApiModelProperty("棰嗙敤鏁伴噺")
+ private BigDecimal applyQty;
+
+ @ApiModelProperty("棰嗙敤鐢ㄩ��")
+ private String applyPurpose;
+
+ @ApiModelProperty("褰掕繕浜� ID")
+ private Integer returnUserId;
+
+ @ApiModelProperty("褰掕繕鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate returnTime;
+
+ @ApiModelProperty("褰掕繕鎯呭喌璇存槑")
+ private String returnRemark;
+
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer tenantId;
+}
--
Gitblit v1.9.3