From 4e0f9ae911742c41ef2b87647afdfd7df54d3e18 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 07 五月 2025 19:23:20 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 1d9dbbe..026f44e 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
@@ -19,13 +19,25 @@
@ApiModelProperty("所属社区")
private String belongCommunity;
+ @ApiModelProperty("单位归属")
+ private String belongTo;
+
+ @ApiModelProperty("所属党组织")
+ private String orgName;
+
+ @ApiModelProperty("单位名称")
+ private String unitName;
+
@ApiModelProperty("服务次数")
private Integer serviceTimes;
@ApiModelProperty("服务时长")
- private Integer serviceTime;
+ private Double serviceTime;
@ApiModelProperty("党员id")
@JsonSerialize(using = ToStringSerializer.class)
private Long memberId;
+
+ @ApiModelProperty("党员积分")
+ private Long partyCount=0l;
}
\ No newline at end of file
--
Gitblit v1.7.1