修改冲突

src/components/VisaCenter/VisaApplicationDetails.vue

@@ -27,7 +27,6 @@
             <el-dropdown-menu slot="dropdown" >
               <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1"  :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
               <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
-              <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>其他</el-dropdown-item>
               
             </el-dropdown-menu>
           </el-dropdown>
@@ -35,11 +34,7 @@
             {{$t('visa.v_gvisa')}}
             <el-dropdown-menu slot="dropdown" >
               <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
-<<<<<<< HEAD
               <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
-=======
-              <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>其他</el-dropdown-item>
->>>>>>> 292691f5f6e9626c70936d1e9ce1f153541b45b3
            </el-dropdown-menu>
           </el-dropdown>
         </div>