Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-28 230dba4f152e7d744b8e6c1124a94d21d2e59018

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