From add39a5a140ca34752dc8f91a1b7f8f3b8185b72 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 06 八月 2021 15:54:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
index 5fdd5cf..e5b378f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
@@ -14,13 +14,12 @@
  * @author: llming
  */
 @Data
-@EncryptDecryptClass
 public class ComMngPopulationMistakeExcelVO implements Serializable {
 
     @ExcelProperty(value = "姓名", index = 0)
     private String name;
 
-    @EncryptDecryptField
+    @ExcelProperty(value = "身份证号", index = 1)
     private String cardNo;
 
     @ExcelProperty(value = "民族", index = 2)

--
Gitblit v1.7.1