From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
index 528d37f..f211e73 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
@@ -122,6 +122,7 @@
}
}
+ //������������
Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(params);
if (!ObjectUtils.isEmpty(windDirAvg)) {
jsonMap.putAll(windDirAvg);
--
Gitblit v1.8.0