Merge branch 'feng-jinfa-20221102' into 'jinfa-20221102'

src/pages/balance/businessRequestFunds/detail/index.tsx

@@ -174,7 +174,7 @@ const SearchDetail = () => {
     },
     {
       title: '预计结算日期',
-      dataIndex: 'billTypeName', //02todo
+      dataIndex: 'settlementTime', 
     },
     {
       title: intl.formatMessage({ id: 'balance.businessRequestFunds.detail.columns.billTypeName' }),

src/pages/contract/components/detailCard/PaymentCard/index.tsx

@@ -107,7 +107,7 @@ const PaymentCard: React.FC<Iprops> = ({
           <div className='ant-card-head-wrapper'>
             {title ? title : intl.formatMessage({id: 'contract.fukuanjihua'})}
           </div>
-          {oldPayPlanList &&
+          {oldPayPlanList.length &&
           !isEqual(handlePayPlanList(payPlanList), handlePayPlanList(oldPayPlanList)) ? (
             <div className={style.changeBtn}>
               <div

src/pages/transaction/purchaseRequisition/index.tsx

@@ -117,7 +117,6 @@ const RequestBill: React.FC<RequestBillProps> = () => {
         history.push(`/memberCenter/procurementAbility/purchaseRequisition/readyAddBill/edit?id=${record.id}`)
         break;
       case 3:
-        // 02todo作废接口
         postPurchaseRequisitionToVoid({id:record.id}).then(res=>{
           if(res.code===1000) ref.current.reloadCurrent()
         })