From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
index e16c1ed..ec99012 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
@@ -69,7 +69,7 @@
     private String censusRegister;
 
     @ExcelProperty(value = "学历", index = 16)
-    private Integer cultureLevel;
+    private String cultureLevel;
 
     @ExcelProperty(value = "社区矫正人员编号", index = 17)
     private String correctPersonCode;

--
Gitblit v1.7.1