Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/transaction/components/orderMergeInfo/index.tsx

@@ -43,7 +43,7 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
   const otherInfo = [
     { title: '发票:', name: 'invoice', render: item => <div className={style.invoice_list_item}>
       <div className={style.invoice_list_item_content}>
-        <div className={cx(style.invoice_list_item_content_tag, item.invoiceKind !== 1 ? style.special : '')}>{item.invoiceKind === 1 ? '增值税普通发票:' : '增值税专用发票:'}</div>
+        <div className={cx(style.invoice_list_item_content_tag, item.invoiceKind !== 1 ? style.special : '')}>{item.invoiceType === 1 ? '增值税普通发票:' : '增值税专用发票:'}</div>
         <div className={style.invoice_list_item_content_name}>
           <div>{item.title}</div>
           <div>{item.taxNo}</div>
@@ -98,7 +98,7 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
     <Modal title="发票信息" visible={isModalVisible} onOk={()=>setIsModalVisible(false)} onCancel={()=>setIsModalVisible(false)}>
       <Row gutter={[0 ,10]} style={{fontSize: 14}}>
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>开具类型：</Col><Col span={20}>{invoice?.invoiceKind === 1 ? "企业" : "个人"}</Col>
-        <Col span={4} style={{fontSize: 12, color: "#909399"}}>发票种类：</Col><Col span={20}>{invoice?.invoiceTypeName === 1 ? "增值税普通发票" : "增值税专用发票"}</Col>
+        <Col span={4} style={{fontSize: 12, color: "#909399"}}>发票种类：</Col><Col span={20}>{invoice?.invoiceTypeName}</Col>
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>发票抬头：</Col><Col span={20}>{invoice?.title}</Col>
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>纳税号：</Col><Col span={20}>{invoice?.taxNo}</Col>
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>开户行：</Col><Col span={20}>{invoice?.bank}</Col>