From c4d6c6cc7f6a2342cc32e7f67f6f6eeb76a97ac1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 30 三月 2021 19:53:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
index 82a0980..d7fb0bf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -1,9 +1,11 @@
package com.panzhihua.common.model.vos.community;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
/**
* @description: 批量导入实有人口
@@ -12,48 +14,52 @@
@Data
public class ComMngPopulationServeExcelVO implements Serializable {
- @ExcelProperty(value = "家庭成员（姓名）" ,index = 0)
+ @ExcelProperty(value = "家庭成员（姓名）", index = 0)
private String name;
- @ExcelProperty(value = "性别（1.男 2.女 3.未知）" ,index = 1)
+ @ExcelProperty(value = "性别（1.男 2.女 3.未知）", index = 1)
private Integer sex;
- @ExcelProperty(value = "年龄" ,index = 2)
+ @ExcelProperty(value = "年龄", index = 2)
private Integer age;
- @ExcelProperty(value = "是否租住" ,index = 3)
- private Integer adsf;
+ @ExcelProperty(value = "是否租住", index = 3)
+ private Integer isRent;
- @ExcelProperty(value = "街路巷" ,index = 4)
+ @ExcelProperty(value = "街路巷", index = 4)
private String road;
- @ExcelProperty(value = "门牌号" ,index = 5)
+ @ExcelProperty(value = "门牌号", index = 5)
private Integer doorNo;
- @ExcelProperty(value = "楼排号" ,index = 6)
- private String floor;
+ @ExcelProperty(value = "楼排号", index = 6)
+ private Integer floor;
- @ExcelProperty(value = "单元号" ,index = 7)
+ @ExcelProperty(value = "单元号", index = 7)
private Integer unitNo;
- @ExcelProperty(value = "户室（房间号）" ,index = 8)
+ @ExcelProperty(value = "户室（房间号）", index = 8)
private Integer houseNo;
- @ExcelProperty(value = "民族" ,index = 9)
+ @ExcelProperty(value = "民族", index = 9)
private String nation;
- @ExcelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)" ,index = 10)
- private Integer politicalOutlook;
+ @ExcelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)", index = 10)
+ private String politicalOutlook;
- @ExcelProperty(value = "身份证号码" ,index = 11)
+ @ExcelProperty(value = "身份证号码", index = 11)
private String cardNo;
- @ExcelProperty(value = "联系方式" ,index = 12)
+ @ExcelProperty(value = "联系方式", index = 12)
private String phone;
- @ExcelProperty(value = "籍贯" ,index = 13)
+ @ExcelProperty(value = "籍贯", index = 13)
private String nativePlace;
- @ExcelProperty(value = "工作单位" ,index = 14)
+ @ExcelProperty(value = "工作单位", index = 14)
private String workCompany;
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
}
--
Gitblit v1.7.1