From 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 19 八月 2021 18:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java
index 1cc5a6c..d4f0479 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java
@@ -7,6 +7,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -16,6 +17,9 @@
@Data
@EncryptDecryptClass
public class ComMngPopulationCultExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
@ExcelProperty(value = "姓名", index = 1)
private String name;
@@ -72,13 +76,19 @@
@ExcelProperty(value = "户口所在地", index = 18)
private String censusRegister;
- @ExcelProperty(value = "邪教名称", index = 19)
+ @ExcelProperty(value = "邪教名称（涉邪组织）", index = 19)
private String cultName;
- @ExcelProperty(value = "基本情况", index = 20)
+ @ExcelProperty(value = "基本情况（参加邪教的活动情况）", index = 20)
private String basicSituation;
- @ExcelProperty(value = "备注", index = 21)
+ @ExcelProperty(value = "参加邪教时间", index = 21)
+ private Date joinCultDate;
+
+ @ExcelProperty(value = "是否对外宣传（1.是 0.否）", index = 22)
+ private Integer isExternalPublicity;
+
+ @ExcelProperty(value = "备注", index = 23)
private String remark;
@@ -108,4 +118,9 @@
private List<String> userTagStr = Lists.newArrayList();
private Long houseId;
+
+ /**
+ * 出生年月日
+ */
+ private String address;
}
--
Gitblit v1.7.1