From d05e79f08a584bac02dc5994c5786863e47b2be4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 07 五月 2021 16:23:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 100 ++++++++++++++++++++++++--------------------------
1 files changed, 48 insertions(+), 52 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 27ad14e..f0b952c 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
@@ -14,70 +14,66 @@
@Data
public class ComMngPopulationServeExcelVO implements Serializable {
- @ExcelProperty(value = "家庭成员（姓名）", index = 0)
+ @ExcelProperty(value = "姓名", index = 0)
private String name;
- @ExcelProperty(value = "性别（1.男 2.女 3.未知）", index = 1)
- private Integer sex;
-
- @ExcelProperty(value = "年龄", index = 2)
- private Integer age;
-
- @ExcelProperty(value = "是否租住", index = 3)
- private Integer isRent;
-
- @ExcelProperty(value = "街路巷", index = 4)
- private String road;
-
- @ExcelProperty(value = "门牌号", index = 5)
- private Integer doorNo;
-
- @ExcelProperty(value = "楼排号", index = 6)
- private String floor;
-
- @ExcelProperty(value = "单元号", index = 7)
- private Integer unitNo;
-
- @ExcelProperty(value = "户室（房间号）", index = 8)
- private Integer houseNo;
-
- @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 = "身份证号码", index = 11)
+ @ExcelProperty(value = "身份证号码", index = 1)
private String cardNo;
- @ExcelProperty(value = "联系方式", index = 12)
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 3)
+ private Integer politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private Integer isRent;
+
+ @ExcelProperty(value = "与户主关系", index = 5)
+ private String relation;
+
+ @ExcelProperty(value = "街路巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "门牌号", index = 7)
+ private Integer doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private Integer unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private Integer houseNo;
+
+ @ExcelProperty(value = "联系方式", index = 11)
private String phone;
- @ExcelProperty(value = "籍贯", index = 13)
+ @ExcelProperty(value = "籍贯", index = 12)
private String nativePlace;
- @ExcelProperty(value = "工作单位", index = 14)
+ @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;
+
+ @ExcelProperty(value = "备注", index = 17)
+ private String remark;
+
+ private Integer age;
+
+ private Integer sex;
/**
* 扩展字段用逗号隔开
*/
private List<String> userTagStr = Lists.newArrayList();
- public interface sex{
- String nan = "男";
- String nv = "女";
- String no = "未知";
- }
-
- public interface isOk{
- String yes = "是";
- String no = "否";
- }
-
- public interface politicalOutlook{
- String dang = "中共党员";
- String tuan = "共青团员";
- String wu = "无党派人员";
- String qun = "群众";
- }
}
--
Gitblit v1.7.1