From 8555f974846ca5b4f4734f52b51e39cd4502df44 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 02 四月 2021 15:46:30 +0800
Subject: [PATCH] fix:修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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..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
@@ -33,7 +33,7 @@
     private Integer doorNo;
 
     @ExcelProperty(value = "楼排号", index = 6)
-    private Integer floor;
+    private String floor;
 
     @ExcelProperty(value = "单元号", index = 7)
     private Integer unitNo;
@@ -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;
@@ -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