Merge branch 'huacheng_test' into huacheng_zts

张天森

2022-07-14 5f4018c7ab5a13c5f3ae5a0155a121e150f4ad74

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