Merge remote-tracking branch 'origin/cjl' into cjl-230812

cjl

2023-08-15 224cd3ff175864f6f8ac4bd24468809e73e4115f

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