。

src/hotel/components/HouseManage/houseManage.jsx

@@ -23,16 +23,8 @@ export default React.forwardRef((props, ref) => {
   const { hotel, hotelList, onHotelChange } = props
   const [detail, setDetail] = useState([])
 
-<<<<<<< HEAD
-  // const fetchAPI = useMemo(() => hotel.hotelId ? () => getRoomList({ hotelId: hotel.hotelId }) : undefined, [hotel?.hotelId])
-  // const queryParams = useMemo(() => ({}), [])
-  const [queryParams, setQueryParams] = useState({ hotelId: hotel.hotelId, pageNum: 1, pageSize: 10})
-
-  const [loading, setLoading] = useState(false)
-=======
   const fetchAPI = useMemo(() => hotel.hotelId ? () => getRoomList({ hotelId: hotel.hotelId }) : undefined, [hotel?.hotelId])
   const queryParams = useMemo(() => ({ pageNum: 1, pageSize: 0, }), [])
->>>>>>> 91e477ef906774c0e2b33f2118e38d1b1544cb9c
 
   const shareDataRef = useRef()
 
@@ -138,12 +130,7 @@ export default React.forwardRef((props, ref) => {
       })
     }
   }
-<<<<<<< HEAD
-  const handelCopy = (e, val) => {
-    setLoading(true)
-=======
   const handelCopy = (e, val, index) => {
->>>>>>> 91e477ef906774c0e2b33f2118e38d1b1544cb9c
     //阻止冒泡不允许执行父元素的点击事件
     e.stopPropagation()
     saveRoom({ ...val, roomId: null, roomName: val.roomName + '复制', createDate: null }).then((res) => {