From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +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/neighbor/PartyMemberAnalysisVO.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java
index 452eb7b..49666d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.neighbor;
+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;
@@ -17,6 +19,15 @@
@ApiModelProperty("所属社区")
private String belongCommunity;
+ @ApiModelProperty("单位归属")
+ private String belongTo;
+
+ @ApiModelProperty("所属党组织")
+ private String orgName;
+
+ @ApiModelProperty("单位名称")
+ private String unitName;
+
@ApiModelProperty("服务次数")
private Integer serviceTimes;
@@ -24,5 +35,9 @@
private Integer serviceTime;
@ApiModelProperty("党员id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long memberId;
+
+ @ApiModelProperty("党员积分")
+ private Long partyCount;
}
\ No newline at end of file
--
Gitblit v1.7.1