From f6f928d81ad53f424f35a9149db11b301ed7f8a8 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期一, 22 四月 2024 16:25:05 +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 |   12 ++++++++++++
 1 files changed, 12 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 1d9dbbe..f1df81b 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,6 +19,15 @@
     @ApiModelProperty("所属社区")
     private String belongCommunity;
 
+    @ApiModelProperty("单位归属")
+    private String belongTo;
+
+    @ApiModelProperty("所属党组织")
+    private String orgName;
+
+    @ApiModelProperty("单位名称")
+    private String unitName;
+
     @ApiModelProperty("服务次数")
     private Integer serviceTimes;
 
@@ -28,4 +37,7 @@
     @ApiModelProperty("党员id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long memberId;
+
+    @ApiModelProperty("党员积分")
+    private Long partyCount=0l;
 }
\ No newline at end of file

--
Gitblit v1.7.1