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

jinpengyong

2023-11-01 87172c08a55e972ff850ab3542858d11d66505ca

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

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

    private String mac;

}