fix: 1

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockTabList.jsx

@@ -3,15 +3,7 @@ import { Row, Col, List, Tabs, message, Button } from 'antd'
 import { dayjsFormat } from '@/utils/utils'
 import consts from '@/consts'
 import { apiSoftwareAddLonglelog } from '@/services/lock'
-<<<<<<< HEAD
-import { ProductLabel } from '@/pages/Product/Lock/Lockstore'
-=======
-import { ProductLabel } from '@/pages/Product/Lock/LockStore'
->>>>>>> ce41012c72a93a1241284d7c982dc65b09393eba
-import LockModal from './LockModal'
-import { lockTypeEnum } from './LockModal'
 import { servicelogEnum, showProductsStatus, showNewLongleStatus, showMarkStatus } from './consts'
-import { useDispatch } from 'dva'
 
 const LockTabList = props => {
   const { longleLog, longleId, keyNum } = props

src/pages/Product/Lock/Lockstore/components/LocksDetail/index.jsx

@@ -2,15 +2,9 @@ import React, { useState, useEffect } from 'react'
 import { Row, Col } from 'antd'
 import consts from '@/consts'
 import { apiSoftwareDetail } from '@/services/lock'
-<<<<<<< HEAD
-import LockForm from '@/pages/Product/lock/Lockstore/components/LocksDetail/LockForm.jsx'
-import LockLowerList from '@/pages/Product/Lock/Lockstore/components/LocksDetail/LockLowerList'
-import LockTabList from '@/pages/Product/Lock/Lockstore/components/LocksDetail/LockTabList'
-=======
 import LockForm from './LockForm.jsx'
 import LockLowerList from './LockLowerList'
 import LockTabList from './LockTabList'
->>>>>>> ce41012c72a93a1241284d7c982dc65b09393eba
 import { connect } from 'dva'
 
 const Index = props => {