Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

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