Merge branch 'hotfix/hotfix-29236' into test

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

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

@@ -1449,7 +1449,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         }
 
         log.info("开始生成本地json文件……");
-        String sceneJsonLocalPath = ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "scene.json";
+        String sceneJsonLocalPath = ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + newNum + File.separator + "scene.json";
         FileUtils.writeFile(sceneJsonLocalPath,JSON.toJSONString(sceneJson));
 
         String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", newNum);