Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-03 33fdf147bdaa73d2f97479d809597a99ad50a8bb

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