测试合并

720yun_local_manage/gis_pano/src/main/java/com/gis/cms/service/impl/OpsServiceImpl.java

@@ -156,10 +156,10 @@ public class OpsServiceImpl  implements OpsService {
         copyScene(workId, entity.getSceneCodes());
 
         // 合并tour.xml
-//        mergeTour(workId, entity.getSceneCodes());
+        mergeTour(workId, entity.getSceneCodes());
 
         // 压缩
-//        zipWork(workId);
+        zipWork(workId);
         String filePath = "/download/" + workId + ".zip";
         log.info("zip地址：{}", configConstant.serverBasePath + filePath);
         return Result.success(filePath);