Merge branch 'release-swsx' into release

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

src/main/java/com/fdkankan/scene/entity/ScenePlus.java

@@ -125,6 +125,12 @@ public class ScenePlus implements Serializable {
     @TableField("remove_portrait")
     private Integer removePortrait;
 
+    /**
+     * 场景名称
+     */
+    @TableField("laser_title")
+    private String laserTitle;
+
     @TableField("has_floorplan_ai")
     private Integer hasFloorplanAi;
 

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

@@ -134,7 +134,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() == 4 || scenePlus.getSceneSource() == 5 || scenePlus.getSceneSource() == 7){  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,true);
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
@@ -155,7 +155,7 @@ public class SceneCopyServiceImpl implements ISceneCopyService {
 
             this.updateNasSceneJson(targetData,oldNum,newNum,scenePlus.getTitle(),"v4","scene.json");
 
-            if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
+            if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5 || scenePlus.getSceneSource() == 7){  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,false);
             }else {
                 scenePlus.setSceneStatus(-2);