Merge branch '20418order' into 'v2-220418'

src/pages/order/deliveryNotice/receivingNoteQuery/index.tsx

@@ -60,7 +60,7 @@ const ReceivingNoteQuery: React.FC = () => {
     { title: '收货日期', dataIndex: 'receiveTime', key: 'receiveTime' },
     { title: '送货单号', dataIndex: 'deliveryNo', key: 'deliveryNo' },
     { title: '送货日期', dataIndex: 'deliveryTime', key: 'deliveryTime' },
-    { title: '采购会员', dataIndex: 'vendorMemberName', key: 'vendorMemberName' },
+    { title: '采购会员', dataIndex: 'buyerMemberName', key: 'buyerMemberName' },
     { title: '单据时间', dataIndex: 'createTime', key: 'createTime' },
     {
       title: '外部状态',

src/pages/order/receivingNote/deliveryNoteManage/details.tsx

@@ -74,7 +74,7 @@ const DeliveryNoteManageDetails: React.FC = () => {
           </ListInfoItem>
 
           <ListInfoItem label='供应会员'>
-            {info?.buyerMemberName}
+            {info?.vendorMemberName}
           </ListInfoItem>
 
           <ListInfoItem label='收货单摘要'>

src/pages/order/receivingNote/deliveryNoteQuery/details.tsx

@@ -73,7 +73,7 @@ const DeliveryNoteDetails: React.FC = () => {
         </ListInfoItem>
 
         <ListInfoItem label='供应会员'>
-          {info?.buyerMemberName}
+          {info?.vendorMemberName}
         </ListInfoItem>
 
         <ListInfoItem label='送货单摘要'>

src/pages/order/receivingNote/deliveryNoteQuery/index.tsx

@@ -91,7 +91,7 @@ const DeliveryNoteQuery: React.FC = () => {
     },
     { title: '送货单摘要', dataIndex: 'digest', key: 'digest' },
     { title: '送货日期', dataIndex: 'deliveryTime', key: 'deliveryTime' },
-    { title: '供应会员', dataIndex: 'vendorMemberName', key: 'vendorMemberName' },
+    { title: '供应会员', dataIndex: 'buyerMemberName', key: 'buyerMemberName' },
     { title: '单据时间', dataIndex: 'createTime', key: 'createTime' },
     {
       title: '外部状态',