Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-11-08 947d016e4bd349b78d540e3a869f55d68b2c610c

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