From b0027c86cdf6b9f537abceade8cd5315a278e67d Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期日, 25 九月 2022 00:09:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/sanshuohuitang_dev' into huacheng_test
---
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