From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
index c9d6341..90c6a02 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -2,6 +2,8 @@
 
 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;
@@ -13,12 +15,14 @@
  * @author: llming
  */
 @Data
+@EncryptDecryptClass
 public class ComMngPopulationServeExcelVO implements Serializable {
 
     @ExcelProperty(value = "姓名", index = 0)
     private String name;
 
     @ExcelProperty(value = "身份证号码", index = 1)
+    @EncryptDecryptField
     private String cardNo;
 
     @ExcelProperty(value = "民族", index = 2)
@@ -144,7 +148,7 @@
     @ExcelProperty(value = "是否死亡(是/否)", index = 41)
     private Integer death;
 
-    @ExcelProperty(value = "退役军人(是/否)", index = 41)
+    @ExcelProperty(value = "退役军人(是/否)", index = 42)
     private Integer veterans;
 
     @ExcelProperty(value = "残疾人(是/否)", index = 43)
@@ -168,6 +172,9 @@
     @ExcelProperty(value = "特殊情况(重大病史/孕)(是/否)", index = 49)
     private Integer specialCase;
 
+    @ExcelProperty(value = "错误信息", index = 50)
+    private Integer mistake;
+
 
     /**
      * 去重字段,使用(姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室)组合字段进行MD5加密实现去重

--
Gitblit v1.7.1