Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexDynamicStatisticsVO.java

@@ -20,10 +20,10 @@
    @ApiModelProperty("开展文化活动")
    private Integer cultureActivityTotal;

    @ApiModelProperty(value = "党员活动数量",hidden = true)
    @ApiModelProperty(value = "党员活动数量", hidden = true)
    private Integer pbTotal;

    @ApiModelProperty(value = "社区活动数量",hidden = true)
    @ApiModelProperty(value = "社区活动数量", hidden = true)
    private Integer actTotal;

    @ApiModelProperty("发起民意调查")
@@ -31,7 +31,5 @@

    @ApiModelProperty("社区宣传")
    private Integer propagandaTotal;



}