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

cjl

2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07

 screen-api/src/main/java/com/moral/api/pojo/dto/Wind/WindData.java

@@ -17,4 +17,6 @@
    //风速
    private Double windSpeed;

    private String mac;

}