From 72360aba85cc4ba1b0caf0823f63d0b81a26ce07 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 06 六月 2022 09:47:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.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/ComMngPopulationMajorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
index d7b5792..2d983e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
@@ -77,7 +77,7 @@
private String custodyPerson;
@ExcelProperty(value = "与监护人关系", index = 19)
- private Integer custodyRelation;
+ private String custodyRelation;
@ExcelProperty(value = "监护人公民身份号码", index = 20)
private String custodyCardNo;
--
Gitblit v1.7.1