Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-10 f0837ee21f7650d4413830d4ee90da02bcdd6d36

 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);