Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 17870eeeca47c08244b244c0acb7fe3f3216621f

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