Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 a910a2d20c9da4a4f8f6a11d8d8edd7516e418a5

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