From 7f302004e78ca5220a4f88a7fab843964a18739a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 18:35:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java
index e5917ac..1199e69 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java
@@ -70,6 +70,7 @@
     private String community;
 
     @ApiModelProperty(value = "社区ID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long communityId;
 
     @ApiModelProperty(value = "服务对象")
@@ -87,6 +88,9 @@
     @ApiModelProperty(value = "冻结状态 1:已冻结 0:正常中")
     private Integer freezeStatus;
 
+    @ApiModelProperty(value = "是否确认党员信息")
+    private Integer isConfirm;
+
     @ApiModelProperty(value = "拒绝理由")
     private String refuseReason;
 

--
Gitblit v1.7.1