Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-11-10 4c0f9a7eb32a1a449fa472a01d9284642f19cc25

 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;