修改 冲突

src/views/publicment/MyFile.vue

@@ -153,7 +153,7 @@
                         </div>
                         <!-- 右侧 -->
                         <div>
-                            <img :src="sort" alt="">
+                            <img :src="sort" alt="">file-title
                             <!-- //控制宫格展示 -->
                             <img
                               v-if="fileGrid"
@@ -1929,13 +1929,10 @@ export default {
             setTablelevel,
             levelList,
             getLevelList,
-<<<<<<< HEAD
              closeUpload,
             handleRemove,
-            loadingUpload
-=======
-            fileBlur,
->>>>>>> liyangzheng1
+            loadingUpload,
+            fileBlur
         }
     },
     watch: {