Merge branch 'sg-type' into test

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -190,19 +190,20 @@ public class LaserService {
             Camera camera = cameraService.getById(camaraId);
             snCode = camera == null ? null :camera.getSnCode();
         }
-        JSONObject sceneInfo = this.getSceneByNum(oldNum);
-        if(sceneInfo != null){
-            sceneName = sceneInfo.getString("title") +"(copy)";
-        }
+//        JSONObject sceneInfo = this.getSceneByNum(oldNum);
+//        if(sceneInfo != null){
+//            sceneName = sceneInfo.getString("title") +"(copy)";
+//        }
         Map<String,Object> params = new HashMap<>();
         params.put("childName",snCode);
         params.put("createTime", createTime);
         params.put("phone", phone);
         params.put("sceneCode", newNum);
+        params.put("oldSceneCode", oldNum);
         params.put("snCode",snCode);
         params.put("status", status);
         params.put("password", sceneKey);
-        params.put("title", sceneName);
+        //params.put("title", sceneName);
         params.put("userId", userId);
         params.put("isCopy", true);
         params.put("path",path);