Merge branch 'feature-v4.1.0-20220620' into test

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1966,12 +1966,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         List<JSONObject> styles = Lists.newArrayList();
         key = String.format(RedisKey.SCENE_LINKPAN_STYLES, num);
         Map<String, String> styleMap = redisUtil.hmget(key);
-        if(CollUtil.isNotEmpty(styleMap)){
-            styleMap.values().stream().forEach(style->{
+        if(CollUtil.isNotEmpty(styleMap)) {
+            for (String style : styleMap.values()) {
                 styles.add(JSON.parseObject(style));
-            });
+            }
         }
 
+
         //图标按写入时间排序
         styles = this.sortStyles(styles);