Merge branch 'feature-v4.11.0-20231024-dsx' into test

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -481,8 +481,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
         SceneEditControls sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
         SceneInfoVO sceneInfoVO = new SceneInfoVO();
-        BeanUtil.copyProperties(sceneEditInfoExt, sceneInfoVO);
-        BeanUtil.copyProperties(sceneEditInfo, sceneInfoVO, "started");
+        BeanUtil.copyProperties(sceneEditInfoExt, sceneInfoVO, "started");
+        BeanUtil.copyProperties(sceneEditInfo, sceneInfoVO);
         sceneInfoVO.setFloorPlanUpload(JSON.parseArray(sceneEditInfo.getFloorPlanUpload()));
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
             sceneInfoVO.setFloorPlanAngle(0f);