解决冲突
This commit is contained in:
		@ -365,8 +365,8 @@ resourceStatus: any;
 | 
			
		||||
        className: 'text-right',
 | 
			
		||||
        render: 'mybidDetailInfo',
 | 
			
		||||
      },
 | 
			
		||||
      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
 | 
			
		||||
      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
 | 
			
		||||
      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
 | 
			
		||||
      { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
 | 
			
		||||
      { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },
 | 
			
		||||
      { title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-left' },
 | 
			
		||||
      { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
 | 
			
		||||
@ -408,7 +408,7 @@ resourceStatus: any;
 | 
			
		||||
      {
 | 
			
		||||
        title: '操作',
 | 
			
		||||
        fixed: 'right',
 | 
			
		||||
        width: '120px',
 | 
			
		||||
        width: '130px',
 | 
			
		||||
        className: 'text-left',
 | 
			
		||||
        buttons: [
 | 
			
		||||
         
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user