From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 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..cb05ad5 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
@@ -1,13 +1,15 @@
 package com.panzhihua.common.model.vos.community;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.google.common.collect.Lists;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
 
-import java.io.Serializable;
-import java.util.List;
+import lombok.Data;
 
 /**
  * @description: 批量导入邪教人员
@@ -16,6 +18,9 @@
 @Data
 @EncryptDecryptClass
 public class ComMngPopulationCultExcelVO implements Serializable {
+
+    @ExcelProperty(value = "序号", index = 0)
+    private String serialNumber;
 
     @ExcelProperty(value = "姓名", index = 1)
     private String name;
@@ -72,15 +77,20 @@
     @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)
-    private String remark;
+    @ExcelProperty(value = "参加邪教时间", index = 21)
+    private Date joinCultDate;
 
+    @ExcelProperty(value = "是否对外宣传(1.是 0.否)", index = 22)
+    private Integer isExternalPublicity;
+
+    @ExcelProperty(value = "备注", index = 23)
+    private String remark;
 
     /**
      * 去重字段,使用(姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室)组合字段进行MD5加密实现去重
@@ -93,7 +103,7 @@
     private Integer age;
 
     /**
-     * 性别(1.男  2.女)
+     * 性别(1.男 2.女)
      */
     private Integer sex;
 
@@ -108,4 +118,9 @@
     private List<String> userTagStr = Lists.newArrayList();
 
     private Long houseId;
+
+    /**
+     * 出生年月日
+     */
+    private String address;
 }

--
Gitblit v1.7.1