From 34e20241e4f7f96783702f85c2ac5bded7788f5e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 19 九月 2023 16:27:10 +0800
Subject: [PATCH] 新增川工之家 收货地址模块 兑换记录模块
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java | 81 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 38 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 741f6e4..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)
- private String sex;
-
- @ExcelProperty(value = "年龄" ,index = 2)
- private Integer age;
-
- @ExcelProperty(value = "是否租住" ,index = 3)
- private String isRent;
-
- @ExcelProperty(value = "街路巷" ,index = 4)
- private String road;
-
- @ExcelProperty(value = "楼排号" ,index = 5)
- private String doorNo;
-
- @ExcelProperty(value = "门牌号" ,index = 6)
- private String floor;
-
- @ExcelProperty(value = "单元号" ,index = 7)
- private String unitNo;
-
- @ExcelProperty(value = "户室" ,index = 8)
- private String houseNo;
-
- @ExcelProperty(value = "民族" ,index = 9)
- private String nation;
-
- @ExcelProperty(value = "政治面貌" ,index = 10)
- private String politicalOutlook;
-
- @ExcelProperty(value = "身份证号码" ,index = 11)
+ @ExcelProperty(value = "身份证号码", index = 1)
private String cardNo;
- @ExcelProperty(value = "联系方式" ,index = 12)
+ @ExcelProperty(value = "人员类型", index = 2)
+ private String personType;
+
+ @ExcelProperty(value = "人员标签", index = 3)
+ private String tags;
+
+ @ExcelProperty(value = "居住地址", index = 4)
+ private String address;
+
+ @ExcelProperty(value = "性别", index = 5)
+ private String sex;
+
+ @ExcelProperty(value = "民族", index = 6)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 7)
+ private String politicalOutlook;
+
+ @ExcelProperty(value = "出生年月日", index = 8)
+ private String birthday;
+
+ @ExcelProperty(value = "年龄", index = 9)
+ private Integer age;
+
+ @ExcelProperty(value = "联系方式", index = 10)
private String phone;
- @ExcelProperty(value = "籍贯" ,index = 13)
+ @ExcelProperty(value = "籍贯", index = 11)
private String nativePlace;
- @ExcelProperty(value = "工作单位" ,index = 14)
- private String workCompany;
+ @ExcelProperty(value = "本地外地", index = 12)
+ private String outOrLacal;
- @ExcelProperty(value = "标签" ,index = 15)
- private String label;
+ @ExcelProperty(value = "文化程度", index = 13)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况", index = 14)
+ private String marriage;
+
+ @ExcelProperty(value = "健康状况", index = 15)
+ private String healthy;
+
+ @ExcelProperty(value = "工作单位", index = 16)
+ private String workCompany;
}
--
Gitblit v1.7.1