diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
index af10519a..7573ace2 100644
--- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
+++ b/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
@@ -2421,11 +2421,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-<<<<<<< HEAD
       checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
-=======
-      checkFaceApi({ fileUrl: url,projectSn: this.$store.state.projectSn, }).then((res) => {
->>>>>>> aaee4c2abe041e7a4cc1b8c7ded584707e577c92
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({
diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue
index f8706a9a..d49bee98 100644
--- a/src/views/projectFront/laborManage/personModule/temporary.vue
+++ b/src/views/projectFront/laborManage/personModule/temporary.vue
@@ -848,11 +848,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-<<<<<<< HEAD
       checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
-=======
-      checkFaceApi({ fileUrl: url,projectSn: this.$store.state.projectSn, }).then((res) => {
->>>>>>> aaee4c2abe041e7a4cc1b8c7ded584707e577c92
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({