From c740ca8adee39cf8ab0df70594b938a93a6d8afc Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 23 五月 2022 10:09:21 +0800
Subject: [PATCH] 花城E+bug更新

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java
index b3b7f3e..cdc494a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java
@@ -43,14 +43,14 @@
      * 入党时间
      */
     @ApiModelProperty("入党时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date joinTime;
 
     /**
      * 转正时间
      */
     @ApiModelProperty("转正时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date employmentTime;
 
     /**
@@ -88,4 +88,13 @@
     @ApiModelProperty("手机号")
     private String phone;
 
+    @ApiModelProperty("党组织")
+    private String orgName;
+
+    @ApiModelProperty("时长")
+    private Long duration;
+
+    @ApiModelProperty("积分")
+    private Long partyInterval;
+
 }

--
Gitblit v1.7.1