From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
index 1de733e..7206455 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -20,7 +20,7 @@
     private String name;
     @ApiModelProperty(value = "身份证")
     private String idCard;
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty(value = "入党时间")
     private Date joinTime;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@@ -51,4 +51,6 @@
     private Long userId;
     @ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
     private Integer auditResult;
+    @ApiModelProperty(value = "驳回原因")
+    private String refuseReason;
 }

--
Gitblit v1.7.1