Merge branch 'feature-v4.2.0-20220712' into test

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

@@ -1450,6 +1450,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         if(StrUtil.isNotEmpty(plusExt.getVideos())){
             sceneJson.setVideos(plusExt.getVideos());
         }
+        sceneJson.setMosaicList(sceneEditInfoService.getMosaicList(num));
 
         log.info("开始生成本地json文件……");
         String sceneJsonLocalPath = ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + newNum + File.separator + "scene.json";