Merge branch 'hemenkou_dev' into dev

101captain

2022-03-11 a1e2af86c95771262232ad7120b048721c0b2d1d

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