From 7569b9671f219d535838e4b55414ac1c9813a52e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 18:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 4331404..0789848 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)

--
Gitblit v1.7.1