From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
index 35304a1..75963ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.community;
import java.io.Serializable;
+import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -31,27 +32,57 @@
private String dangerType;
/**
+ * 状态
+ */
+ @ExcelProperty(value = "状态", index = 3)
+ private String status;
+
+ /**
* 风险等级
*/
- @ExcelProperty(value = "风险等级", index = 3)
+ @ExcelProperty(value = "风险等级", index = 4)
private String dangerLevel;
/**
* 巡查人员
*/
- @ExcelProperty(value = "巡查人员", index = 4)
- private String personName;
+ @ExcelProperty(value = "巡查人员", index = 5)
+ private String ppersonName;
/**
* 联系电话
*/
- @ExcelProperty(value = "联系电话", index = 5)
- private String personPhone;
+ @ExcelProperty(value = "联系电话", index = 6)
+ private String ppersonPhone;
+
+ /**
+ * 填报时间
+ */
+ @ExcelProperty(value = "填报时间", index = 7)
+ private Date createAt;
/**
* 备注
*/
- @ExcelProperty(value = "备注", index = 6)
+ @ExcelProperty(value = "备注", index = 8)
private String remark;
+ /**
+ * 整改人员
+ */
+ @ExcelProperty(value = "整改人员", index = 9)
+ private String dpersonName;
+
+ /**
+ * 联系电话
+ */
+ @ExcelProperty(value = "联系电话", index = 10)
+ private String dpersonPhone;
+
+ /**
+ * 整改时间
+ */
+ @ExcelProperty(value = "整改时间", index = 11)
+ private Date rectifyTime;
+
}
--
Gitblit v1.7.1