Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-27 8f4269c38cbb60fc18372a7ce83cdcc2e78205f3

 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;
}