解决冲突

src/components/Development/DevelopmentDate.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import DevelopmentEdit from "components/Development/DevelopmentEdit.vue";
+import DevelopmentEdit from 'components/Development/DevelopmentEdit.vue';
 import { selResDelete } from 'config/api';
 
 const columns = [
@@ -118,14 +118,11 @@ export default {
       this.editVisible = true;
     },
 
-<<<<<<< HEAD
+    async closeModal() {},
-    closeModal() {
+
-=======
-    async closeModal(){
-    },
     // 删除
     async onDelete(id) {
-        console.log(id);
+      console.log(id);
       try {
         const params = { param: { id } };
         const res = await selResDelete(params);