From e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 18:06:14 +0800
Subject: [PATCH] Merge branch 'local_20221010' into haucheng_panzhihua
---
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