From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
index 3ed2e1c..90bd665 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
@@ -7,6 +7,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -66,9 +67,42 @@
@ExcelProperty(value = "户口所在地", index = 15)
private String censusRegister;
- @ExcelProperty(value = "备注", index = 16)
+ @ExcelProperty(value = "初次发现日期", index = 16)
+ private String firstDate;
+
+ @ExcelProperty(value = "管控情况", index = 17)
+ private String controlSituation;
+
+ @ExcelProperty(value = "管控人姓名", index = 18)
+ private String controlPerson;
+
+ @ExcelProperty(value = "管控人联系方式", index = 19)
+ private String controlPersonPhone;
+
+ @ExcelProperty(value = "帮扶情况", index = 20)
+ private String helpSituation;
+
+ @ExcelProperty(value = "帮扶人姓名", index = 21)
+ private String helpPerson;
+
+ @ExcelProperty(value = "帮扶人联系方式", index = 22)
+ private String helpPersonPhone;
+
+ @ExcelProperty(value = "吸毒原因", index = 23)
+ private String drugReason;
+
+ @ExcelProperty(value = "吸毒后果", index = 24)
+ private String drugResult;
+
+ @ExcelProperty(value = "有无犯罪史", index = 25)
+ private String haveCrime;
+
+ @ExcelProperty(value = "违法犯罪情况", index = 26)
+ private String crimeSutiation;
+
+ @ExcelProperty(value = "备注", index = 27)
private String remark;
- @ExcelProperty(value = "错误信息", index = 17)
+ @ExcelProperty(value = "错误信息", index = 28)
private String mistake;
}
--
Gitblit v1.7.1