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

cjl

2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297

 screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java

@@ -172,6 +172,7 @@
            });
            dataMap.put("value", JSONObject.toJSONString(jsonMap));
            //存入redis
            jsonMap.put("dataTime", DateUtils.dateToDateString(start));
            redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
            insertData.add(dataMap);
        });