From 74570c3c6b01ef869824030ad110e6b930fa5e08 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java
index 1eccb3e..30f520e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java
@@ -24,7 +24,7 @@
@ExcelProperty(value = "认证身份证号码", index = 1)
@EncryptDecryptField
- private String IdCard;
+ private String idCard;
@ExcelProperty(value = "联系电话", index = 2)
private String phone;
@@ -35,8 +35,11 @@
@ExcelProperty(value = "认证时间", index = 4)
private Date authDate;
- @ExcelProperty(value = "健在（是/否）", index = 5)
- private Integer isAlive;
+ @ExcelProperty(value = "认证期数", index = 5)
+ private String authPeriod;
+
+ @ExcelProperty(value = "标记", index = 6)
+ private String mark;
/**
* 年龄
--
Gitblit v1.7.1