From 8cb82432832795a55d8a72c73484517d110a7b00 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 27 八月 2021 18:15:48 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into shequhuodong

---
 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