diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
index 8822d36c..29d497e3 100644
--- a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
+++ b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="JNPF-common-layout">
 
-<<<<<<< HEAD
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
@@ -207,7 +206,7 @@ width="150" >
         <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
         <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
+
     </div>
 </template>