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/dto/SafeHazardRecordDto.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
new file mode 100644
index 0000000..3d2c2e0
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
@@ -0,0 +1,43 @@
+package com.ruoyi.safe.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class SafeHazardRecordDto extends SafeHazardRecord {
+
+ @ApiModelProperty("棰嗙敤浜�")
+ private String applyUserName;
+
+ @ApiModelProperty("褰掕繕浜�")
+ private String returnUserName;
+
+ @ApiModelProperty("鍗遍櫓婧愬悕绉�")
+ private String name;
+
+ @ApiModelProperty("鍗遍櫓婧愮紪鐮�")
+ private String code;
+
+ @ApiModelProperty("鍗遍櫓婧愮被鍨�")
+ private String type;
+
+ @ApiModelProperty("椋庨櫓绛夌骇")
+ private String riskLevel;
+
+ @ApiModelProperty("鎵�鍦ㄤ綅缃�")
+ private String location;
+
+
+}
--
Gitblit v1.9.3