From 5701920bb7536b98cebbf2dcbc312fb90ef1696e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 30 七月 2022 10:55:57 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java
index a7bf37d..627d12c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java
@@ -1,56 +1,61 @@
package com.panzhihua.common.model.vos.community;
import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ComMngPopulationExcelVo {
- @ExcelProperty(value = "姓名" ,index = 0)
+ @ExcelProperty(value = "姓名", index = 0)
private String name;
- @ExcelProperty(value = "身份证号码" ,index = 1)
+ @ExcelProperty(value = "身份证号码", index = 1)
private String cardNo;
- @ExcelProperty(value = "人员标签" ,index = 2)
- private String label;
+ @ExcelProperty(value = "人员类型", index = 2)
+ private String personType;
- @ExcelProperty(value = "居住地址" ,index = 3)
+ @ExcelProperty(value = "人员标签", index = 3)
+ private String tags;
+
+ @ExcelProperty(value = "居住地址", index = 4)
private String address;
- @ExcelProperty(value = "性别" ,index = 4)
+ @ExcelProperty(value = "性别", index = 5)
private String sex;
- @ExcelProperty(value = "民族" ,index = 5)
+ @ExcelProperty(value = "民族", index = 6)
private String nation;
- @ExcelProperty(value = "政治面貌" ,index = 6)
+ @ExcelProperty(value = "政治面貌", index = 7)
private String politicalOutlook;
- @ExcelProperty(value = "出生年月日" ,index = 7)
+ @ExcelProperty(value = "出生年月日", index = 8)
private String birthday;
- @ExcelProperty(value = "年龄" ,index = 8)
+ @ExcelProperty(value = "年龄", index = 9)
private Integer age;
- @ExcelProperty(value = "联系方式" ,index = 9)
+ @ExcelProperty(value = "联系方式", index = 10)
private String phone;
- @ExcelProperty(value = "籍贯" ,index = 10)
+ @ExcelProperty(value = "籍贯", index = 11)
private String nativePlace;
- @ExcelProperty(value = "本地外地" ,index = 11)
+ @ExcelProperty(value = "本地外地", index = 12)
private String outOrLacal;
- @ExcelProperty(value = "文化程度" ,index = 12)
+ @ExcelProperty(value = "文化程度", index = 13)
private String cultureLevel;
- @ExcelProperty(value = "婚姻状况" ,index = 13)
+ @ExcelProperty(value = "婚姻状况", index = 14)
private String marriage;
- @ExcelProperty(value = "健康状况" ,index = 14)
+ @ExcelProperty(value = "健康状况", index = 15)
private String healthy;
- @ExcelProperty(value = "工作单位" ,index = 15)
+ @ExcelProperty(value = "工作单位", index = 16)
private String workCompany;
}
--
Gitblit v1.7.1