From 486fa904456eefeb096885d3caf63c85f821152d Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 31 三月 2021 11:18:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 24 +++++++++++++++++++++---
1 files changed, 21 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 d7fb0bf..f85ac34 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 Integer sex;
+ private String sex;
@ExcelProperty(value = "年龄", index = 2)
private Integer age;
@ExcelProperty(value = "是否租住", index = 3)
- private Integer isRent;
+ private String isRent;
@ExcelProperty(value = "街路巷", index = 4)
private String road;
@@ -33,7 +33,7 @@
private Integer doorNo;
@ExcelProperty(value = "楼排号", index = 6)
- private Integer floor;
+ private String floor;
@ExcelProperty(value = "单元号", index = 7)
private Integer unitNo;
@@ -62,4 +62,22 @@
* 扩展字段用逗号隔开
*/
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