Merge branch 'hotfix-28281-20220609+' into test

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

@@ -563,7 +563,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 //        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
         this.setExtDataFromV3(sceneInfoVO, scenePlus.getCameraId());
         // TODO: 2022/4/24 v3版本停机要切换---------------------------end
-        sceneInfoVO.setScenePassword(null);
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
             sceneInfoVO.setFloorPlanAngle(0f);
         }
@@ -571,6 +570,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             sceneInfoVO.setFloorPlanCompass(0f);
         }
         redisUtil.set(key, JSON.toJSONString(sceneInfoVO));
+        sceneInfoVO.setScenePassword(null);
 
         return sceneInfoVO;
     }