Merge branch 'project-jmga-2.2.0' into project-jmga-dev

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -176,7 +176,7 @@ public class UploadSceneListener {
         String cpEditUserCmd = "cp -p -r " + sourcePath  + "/env/wwwroot/scene_view_data/" + num +"/user " + sceneEditDataPath;
         CmdUtils.callLineSh(cpEditUserCmd);
         //复制全景关联
-        String cpEditLinkPanCmd = "cp -p -r " + sourcePath  + "/env/wwwroot/scene_view_data/" + num +"/images/panorama " + sceneEditDataPath + "images";
+        String cpEditLinkPanCmd = "cp -p -r " + sourcePath  + "/env/wwwroot/scene_view_data/" + num +"/images/panorama " + sceneEditDataPath + "images/";
         CmdUtils.callLineSh(cpEditLinkPanCmd);
 
         sceneJsonBean.setUploadType("offline");