orgtree冲突

src/components/orgTree/index.vue

@@ -112,11 +112,7 @@ export default {
         this.$emit('defaultOrg',response.data[0]);
         this.defaultKey = response.data[0].id;
         setTimeout(() => {
-<<<<<<< .mine
           this.$refs.tree.setCurrentKey(response.data[0].id);
-=======
-          this.$refs.tree.setCurrentKey(response.data[0].id)
->>>>>>> .theirs
         }, 100);
       });
     },
@@ -140,5 +136,5 @@ export default {
       background-color: #d1e0f1 !important;
     }
   }
-}
+
 </style>