Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java

@@ -82,7 +82,7 @@
    private Integer partyActivityCount;

    @ApiModelProperty(value = "党员活动时长（小时）")
    private Integer partyActivityDuration;
    private Integer partyActivityDuration = 0;

    @ApiModelProperty(value = "党员活动积分数量")
    private Integer partyActivityIntegral;