From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 19:58:45 +0800
Subject: [PATCH] 党员、诉求评论基础代码

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
index 5fdd5cf..866223b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
@@ -1,26 +1,22 @@
 package com.panzhihua.common.model.vos.community;
 
-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 com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
 
 /**
  * @description: 批量导入实有人口
  * @author: llming
  */
 @Data
-@EncryptDecryptClass
 public class ComMngPopulationMistakeExcelVO implements Serializable {
 
     @ExcelProperty(value = "姓名", index = 0)
     private String name;
 
-    @EncryptDecryptField
+    @ExcelProperty(value = "身份证号", index = 1)
     private String cardNo;
 
     @ExcelProperty(value = "民族", index = 2)
@@ -32,7 +28,7 @@
     @ExcelProperty(value = "是否租住", index = 4)
     private String isRent;
 
-    @ExcelProperty(value = "与户主关系(户主/配偶/子女/孙女/父母/其他)", index = 5)
+    @ExcelProperty(value = "与户主关系", index = 5)
     private String relation;
 
     @ExcelProperty(value = "街/路/巷", index = 6)
@@ -101,10 +97,10 @@
     @ExcelProperty(value = "是否居住地(是/否)", index = 27)
     private String residence;
 
-//    @ExcelProperty(value = "居住地址", index = 28)
-//    private String address;
+    // @ExcelProperty(value = "居住地址", index = 28)
+    // private String address;
 
-    @ExcelProperty(value = "人员类型(户籍人员/留守人员/外地人员/境外人员)", index = 28)
+    @ExcelProperty(value = "人员类型(户籍人口/留守人员/外地人员/境外人员/流动人口/常住人口/暂住人口)", index = 28)
     private String personType;
 
     @ExcelProperty(value = "国家", index = 29)

--
Gitblit v1.7.1