From 5bc66d568ea4b12d23dd181fd74a17e2845f3d7d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 17 七月 2024 16:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java
index 55ed7f0..9e572bc 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPointExport.java
@@ -56,6 +56,25 @@
@Excel(name = "完成情况")
private String acceptOpinion;
+ @Excel(name = "上报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String registerCreateTime;
+
+ @Excel(name = "判定人")
+ private String judgeUserName1;
+
+ @Excel(name = "核查人")
+ private String examineUserName;
+
+ @Excel(name = "登记人员")
+ private String registerUserName;
+
+ @Excel(name = "登记时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String registerCreateTime1;
+
+
+
//
// @Excel(name = "排查方式")
@@ -94,12 +113,7 @@
// @Excel(name = "整改状态")
// private String rectifyStatus;
//
-// @Excel(name = "隐患登记时间")
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// private String registerCreateTime;
-//
-// @Excel(name = "登记人员")
-// private String registerUserName;
+
//
// @Excel(name = "隐患核查时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.2