Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 d5169c9fa423292a1efc372b804b0a1eecad8dee

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