From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java
index edbbd49..75f6565 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java
@@ -2,6 +2,8 @@
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,6 +16,7 @@
  * @date: 2021/3/11 17:11
  */
 @Data
+@EncryptDecryptClass
 public class ComMngCarExcelVO implements Serializable {
     /**
      * 小区名称
@@ -29,6 +32,7 @@
     /**
      * 车主身份证号码
      */
+    @EncryptDecryptField
     @ExcelProperty(value = "车主身份证号码" ,index = 2)
     private String cardNo;
 
@@ -55,12 +59,6 @@
      */
     @ExcelProperty(value = "联系方式" ,index = 6)
     private String mobile;
-
-    /**
-     * 详细住址
-     */
-    @ExcelProperty(value = "详细住址" ,index = 7)
-    private String address;
 
 }
 

--
Gitblit v1.7.1