From da076e94e5881321898cf51adfc763f1c34d8a86 Mon Sep 17 00:00:00 2001
From: janedididada <105195341+janedididada@users.noreply.github.com>
Date: Thu, 14 Dec 2023 18:13:10 +0800
Subject: [PATCH] =?UTF-8?q?feat()=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrderInquiry/ParkingOrderInquiry/index.jsx           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
index 3acb403..f451ef9 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@@ -898,6 +898,7 @@ function ParkingOrderInquiry(props) {
                             ):null} */}
                 {
                     tabKeyChild == 1 ?
+<<<<<<< Updated upstream
                         <div style={{ height: '800px' }}>
                             <TableModule
                                 columns={acdColums}
@@ -911,6 +912,21 @@ function ParkingOrderInquiry(props) {
                                 search={searchOther}
                             />
                         </div>
+=======
+                    <div style={{ height: '800px' }}>
+                        <TableModule
+                            columns={acdColums}
+                            tableData={resultData}
+                            formSearch={[ash[25], ash[0], ash[1], ash[2], ash[3], ash[18], ash[5], ash[12], ash[26], ash[29]]}
+                            total={total}
+                            initFormData={{ type: 1 }}
+                            rowKey={"order_id"}
+                            exportUrl={'/api/fin/order_search/arrears_order_export'}
+                            limitCon={limitCon}
+                            search={searchOther}
+                        />
+                        </div> 
+>>>>>>> Stashed changes
                         : null
                 }
             </Tabs.TabPane>