Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85

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

@@ -16,4 +16,6 @@
    private Integer y;
    @ApiModelProperty("累计数")
    private Integer countY;

    private String year;
}