Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-12-13 f057850aac83d7b154b5b96592ec1c944ebdf375

 ycl-platform/src/main/java/com/ycl/vo/TrendVo.java

@@ -18,7 +18,7 @@
    private String name;

    @ApiModelProperty(value = "报警数量")
    private String count;
    private Long count;

    @ApiModelProperty(value = "报警日期")
    private String dateTime;