Merge branch 'v2-0418-xxx' into 'v2-220418'

src/pages/transaction/purchaseRequisition/components/billDelivery/index.tsx

@@ -57,7 +57,7 @@ const BillDelivery: React.FC<BasicInfoProps> = ({ cardTitle, type, styles }) =>
           fieldList.length ? fieldList.map((_v, _i) => <Row key={_v.name} className={style['card-list']} style={_v.rowStyle}>
             {_v?.noTitle ? null : <Col span={6} className={style['card-list_title']}>{_v.title}</Col>}
             {
-              _data.deliveryMethod == "物流" && _v.title == '送货地址：' ?
+              _data.deliveryMethodName == "物流" && _v.title == '送货地址：' ?
                 <Col><p style={{ paddingRight: 20 }}>{_data.receiverAddressResponse.provinceName + _data.receiverAddressResponse.districtName + _data.receiverAddressResponse.cityName}</p></Col>
                 : <Col><p style={{ paddingRight: 20 }}>{_v.render ? _v.render(dataSource[_v.name], dataSource) : dataSource[_v.name]}</p></Col>