解决代码冲突

src/views/SelectIdentity.vue

@@ -205,17 +205,11 @@ export default class SelectIdentity extends Vue {
     this.disableBack();
     this.disableBack();
 
 
     await this.getUserInfo();
     await this.getUserInfo();
-<<<<<<< HEAD
     // if (this.id_no) {
     // if (this.id_no) {
-    //   await this.getDispatchList();
+    //   await this.getDispatchList(); //这里是开启劳务派遣的开关,这里开启后需要html解注
     // }
     // }
-=======
-    if (this.id_no) {
-      await this.getDispatchList(); //这里是开启劳务派遣的开关,这里开启后需要html解注
-    }
 
 
     this.loading.clear();
     this.loading.clear();
->>>>>>> 22148dfb71906f3bc049514c232d0815c1f37348
   }
   }
 }
 }
 </script>
 </script>