diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html
index 1d72cb95..a26b9fd2 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -38,12 +38,12 @@
           <li nz-menu-item (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">
             新增企业
           </li>
-          <li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']">
+          <!-- <li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']">
             修改合伙人
           </li>
           <li nz-menu-item (click)="editSale()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-sale']">
             修改渠道销售
-          </li>
+          </li> -->
         </ul>
       </nz-dropdown-menu>
     </div>
@@ -91,21 +91,11 @@
     </div>
   </div>
 </ng-template>
-<<<<<<< HEAD
-<ng-template #extraTemplate>
-  <!-- <div>
-=======
 <!-- <ng-template #extraTemplate>
   <div>
->>>>>>> fc92a8b86874ab4a25a1d2625dea8fafe2bc557e
     <button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人
     </button>
     <button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售
     </button>
-<<<<<<< HEAD
-  </div> -->
-</ng-template>
-=======
   </div>
 </ng-template> -->
->>>>>>> fc92a8b86874ab4a25a1d2625dea8fafe2bc557e