From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-api/src/main/java/com/moral/api/pojo/dto/Wind/WindData.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/Wind/WindData.java b/screen-api/src/main/java/com/moral/api/pojo/dto/Wind/WindData.java
index 6c56f2d..22a3911 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/Wind/WindData.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/Wind/WindData.java
@@ -17,4 +17,6 @@
     //������
     private Double windSpeed;
 
+    private String mac;
+
 }

--
Gitblit v1.8.0