Merge branch 'release-注册用户复制场景' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/service/impl/SceneCopyServiceImpl.java

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

@@ -88,8 +88,9 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
             if(plusExt == null){
                 return;
             }
+            String title = userId == null ? scenePlus.getTitle() +"(copy)" : scenePlus.getTitle();
             scenePlus.setNum(newNum);
-            scenePlus.setTitle(scenePlus.getTitle() +"(copy)");
+            scenePlus.setTitle(title);
             scenePlus.setSceneStatus(0);
             scenePlus.setId(null);
             if(userId != null){//目标用户ID不为空，则是注册用户复制场景
@@ -147,7 +148,7 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
                 });
             }
 
-            if(scenePlus.getSceneSource() == SceneSource.JG.code() || scenePlus.getSceneSource() == SceneSource.SG.code() || scenePlus.getSceneSource() == SceneSource.SX.code()){  //深时复制
+            if(scenePlus.getSceneSource() == SceneSource.JG.code() || scenePlus.getSceneSource() == SceneSource.SG.code() || scenePlus.getSceneSource() == SceneSource.SX.code()){//点云复制
                 laserService.copy(oldNum,newNum,newDataSource,true, userId, scenePlus.getDemo());
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);