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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyBuild.java

@@ -5,7 +5,7 @@

/**
 * @ClasssName BigScreenStatisticParty
 * @Description  大屏数据党建统计信息
 * @Description 大屏数据党建统计信息
 * @Author cedoo
 * @Date 2021/6/15
 * @Version 1.0
@@ -20,6 +20,6 @@
    @ApiModelProperty(value = "党员活动数")
    private Integer activityCount;
    @ApiModelProperty(value = "党建宣传数")
    private Integer dynCount;//党建动态
    private Integer dynCount;// 党建动态

}