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

cjl

2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e

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

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

    private String mac;

}