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

cjl

2023-08-02 ee2d9a4049baa9ecc3f43d0576fd3745688171be

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