Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 d079a68e22e9e11ad4af0b11e19d9398bd62f193

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