From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java |   54 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 17 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 2097496..bec329d 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
@@ -5,8 +5,8 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 import lombok.Data;
 
 /**
@@ -30,82 +30,102 @@
     /**
      * 鍣０
      */
-    private BigDecimal noise;
+    private String noise;
 
     /**
      * 纭寲姘�
      */
-    private BigDecimal hydrogenSulfide;
+    private String hydrogenSulfide;
 
     /**
      * SO2 娴撳害
      */
-    private BigDecimal so2;
+    private String so2;
 
     /**
      * NO2 娴撳害
      */
-    private BigDecimal no2;
+    private String no2;
 
     /**
      * CO 娴撳害
      */
-    private BigDecimal co;
+    private String co;
 
     /**
      * o3 娴撳害
      */
-    private BigDecimal o3;
+    private String o3;
 
     /**
      * pm2.5 娴撳害
      */
-    private BigDecimal pm2point5;
+    private String pm2point5;
 
     /**
      * pm10
      */
-    private BigDecimal pm10;
+    private String pm10;
 
     /**
      * 绌烘皵娓╁害
      */
-    private BigDecimal airTemperature;
+    private String airTemperature;
 
     /**
      * 绌烘皵婀垮害
      */
-    private BigDecimal airHumidity;
+    private String airHumidity;
 
     /**
      * 澶ф皵鍘嬪己
      */
-    private BigDecimal airPressure;
+    private String airPressure;
 
     /**
      * 椋庡悜
      */
-    private BigDecimal windDirection;
+    private String windDirection;
 
     /**
      * 椋庨��
      */
-    private BigDecimal windSpeed;
+    private String windSpeed;
 
     /**
      * 鍗佸垎閽熼洦閲�
      */
-    private BigDecimal tenRainfallMin;
+    private String tenRainfallMin;
 
     /**
      * 杈愬皠
      */
-    private BigDecimal radiation;
+    private String radiation;
 
     /**
      * 鍏夌収
      */
-    private BigDecimal illumination;
+    private String illumination;
+
+    /**
+     * 绱绾�
+     */
+    private String ultraviolet;
+
+    /**
+     * co2 浜屾哀鍖栫⒊
+     */
+    private String co2;
+
+    /**
+     * 姘ф皵
+     */
+    private String o2;
+
+    /**
+     * 璁惧绫诲瀷
+     */
+    private String type;
 
     /**
      * 鍒涘缓鏃堕棿

--
Gitblit v1.9.3