From 483a07154eed1c3af9ef3d4f48071646f3714d2c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 01 八月 2021 15:50:15 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 0b42ea1..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 {
/**
* 小区名称
@@ -27,34 +30,35 @@
private String userName;
/**
+ * 车主身份证号码
+ */
+ @EncryptDecryptField
+ @ExcelProperty(value = "车主身份证号码" ,index = 2)
+ private String cardNo;
+
+ /**
* 品牌型号
*/
- @ExcelProperty(value = "品牌型号" ,index = 2)
+ @ExcelProperty(value = "品牌型号" ,index = 3)
private String brand;
/**
* 车牌号
*/
- @ExcelProperty(value = "车牌号" ,index = 3)
+ @ExcelProperty(value = "车牌号" ,index = 4)
private String plateNum;
/**
* 车身颜色
*/
- @ExcelProperty(value = "颜色" ,index = 4)
+ @ExcelProperty(value = "颜色" ,index = 5)
private String color;
/**
* 联系方式
*/
- @ExcelProperty(value = "联系方式" ,index = 5)
+ @ExcelProperty(value = "联系方式" ,index = 6)
private String mobile;
-
- /**
- * 详细住址
- */
- @ExcelProperty(value = "详细住址" ,index = 6)
- private String address;
}
--
Gitblit v1.7.1