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/EldersAuthDetailsVO.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
index 8a43569..ce5e3b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
@@ -1,6 +1,11 @@
 package com.panzhihua.common.model.vos.community;
 
 import java.util.*;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +20,7 @@
  * */
 @Data
 @ApiModel("高龄认证返回参数")
+@EncryptDecryptClass
 public class EldersAuthDetailsVO {
 
     @ApiModelProperty(value = "ID")
@@ -23,8 +29,8 @@
     @ApiModelProperty(value = "创建人")
 	private Long createBy;
 
-    @ApiModelProperty(value = "创建时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "认证时间")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date createAt;
 
     @ApiModelProperty(value = "更新人")
@@ -35,6 +41,8 @@
 	private Date updateAt;
 
     @ApiModelProperty(value = "身份证")
+	@Sensitive(strategy = SensitiveStrategy.ID_CARD)
+	@EncryptDecryptField
 	private String idCard;
 
     @ApiModelProperty(value = "认证人姓名")
@@ -72,4 +80,7 @@
 	@ApiModelProperty(value = "家庭成员ID")
 	private Long  familyUserId;
 
+	@ApiModelProperty(value = "核验类型(1.视频认证 2.人脸核验)")
+	private Integer type;
+
 }

--
Gitblit v1.7.1