diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
index f451ef9..43d7df9 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@@ -898,21 +898,6 @@ function ParkingOrderInquiry(props) {
                             ):null} */}
                 {
                     tabKeyChild == 1 ?
-<<<<<<< Updated upstream
-                        <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>
-=======
                     <div style={{ height: '800px' }}>
                         <TableModule
                             columns={acdColums}
@@ -924,10 +909,8 @@ function ParkingOrderInquiry(props) {
                             exportUrl={'/api/fin/order_search/arrears_order_export'}
                             limitCon={limitCon}
                             search={searchOther}
-                        />
-                        </div> 
->>>>>>> Stashed changes
-                        : null
+                        /> 
+                        </div>: null
                 }
             </Tabs.TabPane>
             <Tabs.TabPane tab="订单修改记录" key="2">