Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1

mitao

2025-05-07 4e0f9ae911742c41ef2b87647afdfd7df54d3e18

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java

@@ -32,12 +32,12 @@
    private Integer serviceTimes;

    @ApiModelProperty("服务时长")
    private Integer serviceTime;
    private Double serviceTime;

    @ApiModelProperty("党员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long memberId;

    @ApiModelProperty("党员积分")
    private Long partyCount;
    private Long partyCount=0l;
}