Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-04-22 4da6ddeb728bb4649328aa652ffc1c56b0e81629

 screen-api/src/main/java/com/moral/api/pojo/vo/historyFiveMinutely/QueryFiveDataByMacVO.java

@@ -44,4 +44,7 @@

    @ApiModelProperty(value = "风速")
    private String a01007;

    @ApiModelProperty(value = "tvos")
    private String a99054;
}