From 83e42707519f5e2d886618ea55c30e8c3ab381ac Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Wed, 09 Aug 2023 09:13:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl --- screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java index 1dd921d..a4514b6 100644 --- a/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java +++ b/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java @@ -17,22 +17,47 @@ */ private Double flyLon; - private Double coAvg; +// private Double coAvg; +// +// private Double SO2Avg; +// +// private Double NO2Avg; +// +// private Double PM10Avg; +// +// private Double PM25Avg; +// +// private Double TVOCAvg; +// +// private Double O3Avg; +// +// private Double WDAvg; +// +// private Double SHAvg; - private Double SO2Avg; - private Double NO2Avg; +// private Double QYAvg; - private Double PM10Avg; - private Double PM25Avg; + private Double a21005; - private Double TVOCAvg; + private Double a21026; - private Double O3Avg; + private Double a21004; - private Double WDAvg; + private Double a34002; - private Double SHAvg; + private Double a34004; + + private Double a99054; + + private Double a05024; + + private Double a01001; + + private Double a01002; + + + private Double a01006; } -- Gitblit v1.8.0