From e23107ef049fefa00cd54a4a2271513da81644f7 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 13 九月 2021 20:23:29 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 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 fe2b756..1ed248d 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
@@ -4,6 +4,7 @@
 
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,11 +33,45 @@
     @ApiModelProperty(value = "提交用户")
     private Long submitUserId;
 
+    @ApiModelProperty(value = "提交用户姓名")
+    private String submitUserName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "身份证号")
+    @EncryptDecryptField
+    private String idCard;
+
+    @ApiModelProperty(value = "性别(1.男 2.女 3.其他)")
+    private String sex;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
+    @ApiModelProperty(value = "出生日期")
+    private String birthday;
+
+    @ApiModelProperty(value = "人员类别(1.80-89周岁 2.90-99周岁 3.100周岁(含)以上)")
+    private Integer personnelCategory;
+
+    @ApiModelProperty(value = "是否高龄老人登记(1.是  0.否)")
+    private Integer isRegister;
+
+    @ApiModelProperty(value = "是否健在(1.是  0.否)")
+    private Integer isAlive;
+
+    @ApiModelProperty(value = "居住地址")
+    private String address;
+
     @ApiModelProperty(value = "认证视频url")
     private String authVideo;
 
-    @ApiModelProperty(value = "审核人员")
-    private String approver;
+    @ApiModelProperty(value = "审核人员id")
+    private String approverId;
 
     @ApiModelProperty(value = "审核状态(1.待审核 2.驳回 3.通过)")
     private Integer approvalStatus;
@@ -51,7 +86,7 @@
     private String rejectReason;
 
     @ApiModelProperty(value = "认证状态")
-    private Boolean authStatus;
+    private Integer authStatus;
 
     @ApiModelProperty(value = "认证时间")
     private Date authDate;

--
Gitblit v1.7.1