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/SafeHazard.java |   93 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 93 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
new file mode 100644
index 0000000..43e5c1e
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
@@ -0,0 +1,93 @@
+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.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 10:09:24
+ */
+@Getter
+@Setter
+@TableName("safe_hazard")
+@ApiModel(value = "SafeHazard瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+public class SafeHazard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("鍗遍櫓婧愬悕绉�")
+    private String name;
+
+    @ApiModelProperty("鍗遍櫓婧愮紪鐮�")
+    private String code;
+
+    @ApiModelProperty("鍗遍櫓婧愮被鍨�")
+    private String type;
+
+    @ApiModelProperty("椋庨櫓绛夌骇")
+    private String riskLevel;
+
+    @ApiModelProperty("鎵�鍦ㄤ綅缃�")
+    private String location;
+
+    @ApiModelProperty("瑙勬牸 / 椋庨櫓鎻忚堪")
+    private String specInfo;
+
+    @ApiModelProperty("绠℃帶鎺柦")
+    private String controlMeasures;
+
+    @ApiModelProperty("绠℃帶璐d换浜� ID")
+    private Integer principalUserId;
+
+    @ApiModelProperty("绠℃帶璐d换浜�")
+    @TableField(exist = false)
+    private String principalUser;
+
+    @ApiModelProperty("璐d换浜鸿仈绯荤數璇�")
+    private String principalMobile;
+
+    @ApiModelProperty("搴撳瓨鏁伴噺")
+    private BigDecimal stockQty;
+
+    @ApiModelProperty("澶囨敞")
+    private String remark;
+
+    @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