From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/util/AQICalculation2.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/util/AQICalculation2.java b/src/main/java/com/moral/util/AQICalculation2.java
index 038d8ad..3f62277 100644
--- a/src/main/java/com/moral/util/AQICalculation2.java
+++ b/src/main/java/com/moral/util/AQICalculation2.java
@@ -84,13 +84,13 @@
 				case "PM10":PM10AQI = PM10AQI(value);
 					AQIMap.put("PM10",PM10AQI);
 					break;
-				case "SO2":SO2AQI = SO2AQI(value);
+				case "SO2":SO2AQI = SO2DayAQI(value);
 					AQIMap.put("SO2",SO2AQI);
 					break;
-				case "NO2":NO2AQI = NO2AQI(value);
+				case "NO2":NO2AQI = NO2DayAQI(value);
 					AQIMap.put("NO2",NO2AQI);
 					break;
-				case "CO":COAQI = COAQI(value);
+				case "CO":COAQI = CODayAQI(value);
 					AQIMap.put("CO",COAQI);
 					break;
 				case "maxO3_8h":maxO38hAQI = O3DayAQI(value);

--
Gitblit v1.8.0