From a218ccaadff80203bcf82f251f0d448449858ac5 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 02 四月 2021 09:41:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 f85ac34..27ad14e 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
@@ -18,13 +18,13 @@
private String name;
@ExcelProperty(value = "性别（1.男 2.女 3.未知）", index = 1)
- private String sex;
+ private Integer sex;
@ExcelProperty(value = "年龄", index = 2)
private Integer age;
@ExcelProperty(value = "是否租住", index = 3)
- private String isRent;
+ private Integer isRent;
@ExcelProperty(value = "街路巷", index = 4)
private String road;
@@ -45,7 +45,7 @@
private String nation;
@ExcelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)", index = 10)
- private String politicalOutlook;
+ private Integer politicalOutlook;
@ExcelProperty(value = "身份证号码", index = 11)
private String cardNo;
--
Gitblit v1.7.1