合并冲突

src/pages/staff/list/StaffList.jsx

@@ -114,12 +114,8 @@ const header = (props) => {
   const getList = (params) => {
     request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
       console.log(data, "listData")
-<<<<<<< HEAD
-      setTempData(data)
-=======
       setData(data)
       setTempData(data.records)
->>>>>>> 07ab51117db15061e9e469cbddcabf3ec412859e
       setPageTotal(data.total)
     })
   }
@@ -209,16 +205,12 @@ const header = (props) => {
       </Row>
 
       {/* 分页  */}
-      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-<<<<<<< HEAD
-        <Pagination showQuickJumper defaultCurrent={1} total={pageTotal} onChange={onChange} current={tempData.current}/>
-=======
+      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>     
         <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={pageTotal} onChange={onChange} current={data.current}/>
->>>>>>> 07ab51117db15061e9e469cbddcabf3ec412859e
       </div>
     </>
   )
 }
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader