From 1548b7d4e9b18adb5c0e84d0142be20725dbfcf7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 10 九月 2021 16:57:39 +0800
Subject: [PATCH] 修改报警相关功能
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 92bc6c2..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
@@ -1,14 +1,15 @@
package com.panzhihua.common.model.vos.community;
+import java.io.Serializable;
+import java.util.Date;
+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: 批量导入社区矫正人员
@@ -68,7 +69,7 @@
private String censusRegister;
@ExcelProperty(value = "学历", index = 16)
- private Integer cultureLevel;
+ private String cultureLevel;
@ExcelProperty(value = "社区矫正人员编号", index = 17)
private String correctPersonCode;
@@ -160,7 +161,6 @@
@ExcelProperty(value = "备注", index = 46)
private String remark;
-
/**
* 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
*/
@@ -172,7 +172,7 @@
private Integer age;
/**
- * 性别（1.男 2.女）
+ * 性别（1.男 2.女）
*/
private Integer sex;
--
Gitblit v1.7.1