diff --git a/src/views/convenience/detail.vue b/src/views/convenience/detail.vue
index 25357cf..72bca90 100644
--- a/src/views/convenience/detail.vue
+++ b/src/views/convenience/detail.vue
@@ -944,11 +944,7 @@ export default {
     this.getStaffList();
     this.getCommunicationList();
     this.getTypeList();
-<<<<<<< HEAD
-    this.getRegions();
-=======
     this.getRegionList();
->>>>>>> dxdb
   },
   methods: {
     getInfo() {
@@ -1439,14 +1435,6 @@ export default {
         // this.$refs.eventTypeRef.focusFirstNode();
       }, 100);
     },
-<<<<<<< HEAD
-    
-    // -----------------------
-    getRegions(){
-      getRegionList('CONVENIENCE').then(res=>{
-        console.log(res);
-      })
-=======
     getRegionList() {
       getRegions().then(res => {
         const tempData = res.d;
@@ -1498,7 +1486,6 @@ export default {
     handleRegionChange(val) {
       this.staffQuery.regionIds = val.join(",");
       this.getStaffList();
->>>>>>> dxdb
     }
   },
   beforeRouteLeave(to, from, next) {