From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java
index 5eee904..f403a07 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java
@@ -1,7 +1,11 @@
package com.panzhihua.common.model.vos.community;
import java.util.Date;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
@@ -22,9 +26,11 @@
public class ComPensionAuthRecordVO {
@ApiModelProperty(value = "自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "养老金用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long pensionerId;
@ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证）")
@@ -74,12 +80,16 @@
private String authVideo;
@ApiModelProperty(value = "审核人员id")
- private String approverId;
+ private Long approverId;
+
+ @ApiModelProperty(value = "审核人员名称")
+ private String approverName;
@ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
private Integer approvalStatus;
@ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date approvalDate;
@ApiModelProperty(value = "标记")
@@ -92,11 +102,21 @@
private Integer authStatus;
@ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date authDate;
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
+
+ @ApiModelProperty(value = "待处理id集合")
+ private List<String> nextIds;
+
+ private Long communityId;
+
+ private String areaCode;
}
--
Gitblit v1.7.1