From 0796e9e63faad6d54515e11ac13e36a0c39c2cce Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 11:25:22 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 733b3bf..3f09a50 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
@@ -29,8 +29,8 @@
@ExcelProperty(value = "是否租住", index = 4)
private Integer isRent;
- @ExcelProperty(value = "与户主关系", index = 5)
- private String relation;
+ @ExcelProperty(value = "与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)", index = 5)
+ private Integer relation;
@ExcelProperty(value = "街路巷", index = 6)
private String road;
@@ -53,11 +53,11 @@
@ExcelProperty(value = "籍贯", index = 12)
private String nativePlace;
- @ExcelProperty(value = "文化程度", index = 13)
- private String cultureLevel;
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 13)
+ private Integer cultureLevel;
- @ExcelProperty(value = "婚姻状况", index = 14)
- private String marriage;
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 14)
+ private Integer marriage;
@ExcelProperty(value = "健康状况", index = 15)
private String healthy;
@@ -65,8 +65,8 @@
@ExcelProperty(value = "工作单位", index = 16)
private String workCompany;
- @ExcelProperty(value = "外地or本地", index = 17)
- private String outOrLocal;
+ @ExcelProperty(value = "外地or本地（1.本地 2.外地）", index = 17)
+ private Integer outOrLocal;
@ExcelProperty(value = "户口所在地", index = 18)
private String censusRegister;
@@ -82,4 +82,12 @@
*/
private List<String> userTagStr = Lists.newArrayList();
+ /**
+ * 外地or本地(1.本地 2.外地)
+ */
+ public interface outOrLocal{
+ String bd = "本地";
+ String wd = "外地";
+ }
+
}
--
Gitblit v1.7.1