Browse Source

解决冲突

niuheng 3 years ago
parent
commit
0f62e708ee
1 changed files with 0 additions and 23 deletions
  1. 0 23
      src/components/model/file/floorTable.vue

+ 0 - 23
src/components/model/file/floorTable.vue

@@ -195,7 +195,6 @@ export default {
     },
     // 下载模型文件
     downloadModel(item) {
-      //注释
       let url =
         item.FetchUrl ||
         (item.Url.match(/(\/image-service\S*)$/g)
@@ -350,26 +349,4 @@ export default {
 
 
 
-
-
-
-
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> remotes/origin/origin_master
 </style>