Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-24 12a07448a9b8147d04f73b3a9b8115a69dc8864f

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