From 5f4018c7ab5a13c5f3ae5a0155a121e150f4ad74 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 14 七月 2022 14:15:33 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 e5b378f..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,13 +1,10 @@
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: 批量导入实有人口
@@ -31,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)
@@ -100,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