From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 19:58:45 +0800
Subject: [PATCH] 党员、诉求评论基础代码

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 239de37..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
@@ -1,14 +1,14 @@
 package com.panzhihua.common.model.vos.community;
 
+import java.io.Serializable;
+import java.util.List;
+
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.google.common.collect.Lists;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
+import lombok.Data;
 
 /**
  * @description: 批量导入重精人员
@@ -77,7 +77,7 @@
     private String custodyPerson;
 
     @ExcelProperty(value = "与监护人关系", index = 19)
-    private Integer custodyRelation;
+    private String custodyRelation;
 
     @ExcelProperty(value = "监护人公民身份号码", index = 20)
     private String custodyCardNo;
@@ -106,7 +106,6 @@
     @ExcelProperty(value = "违法犯罪情况", index = 28)
     private String crimeSutiation;
 
-
     /**
      * 去重字段,使用(姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室)组合字段进行MD5加密实现去重
      */
@@ -118,7 +117,7 @@
     private Integer age;
 
     /**
-     * 性别(1.男  2.女)
+     * 性别(1.男 2.女)
      */
     private Integer sex;
 

--
Gitblit v1.7.1