From b7edb0f3526d5ca32016d5f332ddf957d74c01c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 01:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway

---
 src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
index 90a1c85..9c9dcd0 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -12,7 +12,6 @@
     //璁惧缂栫爜
     private String deviceId;
     private ClientHeaders headers;
-
     //娑堟伅 ID
     private String messageId;
 
@@ -22,8 +21,10 @@
 
     private String timestamp;
 
-    private GrainOutPut outPut;
+    private String output;
 
-    private GrainWeather weatherStation;
+    private String weatherStation;
+
+
 
 }

--
Gitblit v1.9.3