From ff04a0429b0bc83adf4c2b0a23e2c1c86f745b0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 20 十一月 2023 17:40:30 +0800
Subject: [PATCH] 积分修改bug3
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java | 16 ++++++++++++++--
1 files changed, 14 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..30e48dc 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
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.partybuilding;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
@Data
@ApiModel
public class ComPbMemberVO {
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -43,14 +46,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 +91,13 @@
@ApiModelProperty("手机号")
private String phone;
+ @ApiModelProperty("党组织")
+ private String orgName;
+
+ @ApiModelProperty("时长")
+ private Long duration;
+
+ @ApiModelProperty("积分")
+ private Long partyInterval;
+
}
--
Gitblit v1.7.1