Merge branch 'huacheng_test' into huacheng

101captain

2022-06-24 21900bb8a3d70c02ba1165b73cdffcd64c8bba1d

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