merge: 解决合并上游分支问题

src/pages/transaction/_public/order/effects/useOrderDetail.tsx

@@ -66,26 +66,6 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
       name: 'businessTypeName',
       span: 8,
     },
-    {
-      label: intl.formatMessage({ id: 'purchaseRequisition.laiyuanshangcheng' }),
-      name: 'shopName',
-      span: 8,
-    },
-    {
-      label: 'SAP订单编号',
-      name: 'purchaseOrderNumber',
-      span: 8,
-    },
-    {
-      label: '订单分类',
-      name: 'documentTypeName',
-      span: 8,
-    },
-    {
-      label: '业务类型',
-      name: 'businessTypeName',
-      span: 8,
-    },
   ])
 
   useEffect(() => {

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

@@ -17,11 +17,7 @@ interface PaymentInfoCardProps extends Omit<CustomizeColumnProps, 'data'> {
   /**
    * 付款条件
    */
-<<<<<<< HEAD
   paymentClauseTypeName: string,
-=======
-   paymentClauseTypeName: string
->>>>>>> aea74cd94 (feact: 金发二开销售订单自测完成)
 }
 
 const PaymentInfoCard: React.FC<PaymentInfoCardProps> = (props) => {