From 4a4db8924da0782d0b698f7585ad6b0577bdca2d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 06 Sep 2023 10:09:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
index 3e607d2..0553ece 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
@@ -121,6 +121,7 @@
}
}
+ //������������
Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(params);
if (!ObjectUtils.isEmpty(windDirAvg)) {
jsonMap.putAll(windDirAvg);
--
Gitblit v1.8.0