Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-10 fe5975b8fc4592e3925a678c28a26563669574e9

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