From 0a30812acaa26ebe654340f7e749a6801b63b194 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 16:32:36 +0800
Subject: [PATCH] changes

---
 dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java
index 7436538..7b7a095 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -34,9 +35,9 @@
     private String noise;
 
     /**
-     * voc鎸ュ彂鎬ф湁鏈虹墿
+     * 纭寲姘�
      */
-    private String voc;
+    private String hydrogenSulfide;
 
     /**
      * SO2 娴撳害
@@ -52,11 +53,6 @@
      * CO 娴撳害
      */
     private String co;
-
-    /**
-     * 浜屾哀鍖栫⒊
-     */
-    private String co2;
 
     /**
      * o3 娴撳害
@@ -99,14 +95,14 @@
     private String windSpeed;
 
     /**
-     * 闄嶉洦閲�
+     * 鍗佸垎閽熼洦閲�
      */
-    private String rainfall;
+    private String tenRainfallMin;
 
     /**
-     * 缈绘枟闆ㄩ噺
+     * 杈愬皠
      */
-    private String tippingBucketRainfall;
+    private String radiation;
 
     /**
      * 鍏夌収
@@ -114,18 +110,24 @@
     private String illumination;
 
     /**
-     * 鐑數鎬昏緪灏�
-     */
-    private String thermalRadiation;
-
-    /**
      * 绱绾�
      */
-    private String ultravioletRay;
+    private String ultraviolet;
 
     /**
-     * 璁惧绫诲瀷  AirNongGengEnums
+     * co2 浜屾哀鍖栫⒊
      */
+    private String co2;
+
+    /**
+     * 姘ф皵
+     */
+    private String o2;
+
+    /**
+     * 璁惧绫诲瀷
+     */
+    @JsonIgnore
     private String type;
 
     /**

--
Gitblit v1.9.3