From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java
index 69a0991..1ec9df3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java
@@ -7,6 +7,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -75,15 +76,21 @@
@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 String joinCultDate;
+
+ @ExcelProperty(value = "是否对外宣传（1.是 0.否）", index = 22)
+ private String isExternalPublicity;
+
+ @ExcelProperty(value = "备注", index = 23)
private String remark;
- @ExcelProperty(value = "错误信息", index = 22)
+ @ExcelProperty(value = "错误信息", index = 24)
private String mistake;
}
--
Gitblit v1.7.1