From f26786e162241b6b803ada6d19d80e1f5fb615e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:36:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTO.java b/screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTO.java
index 54dc8be..2e50d5b 100644
--- a/screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTO.java
+++ b/screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTO.java
@@ -36,10 +36,14 @@
     private int CompositeNum;
 
     private BigDecimal SO2;
+    private int SO2Num;
 
     private BigDecimal NO2;
+    private int NO2Num;
 
     private BigDecimal PM10;
+    private int PM10Num;
 
     private BigDecimal CO;
+    private int CONum;
 }

--
Gitblit v1.8.0