Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-31 b22a45c73c7d3dfdabcd7a0fd8a3b93263a0dfa9

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