fix: 大小写

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

@@ -1,10 +1,6 @@
 import React from 'react'
 import { Row, Col, Divider } from 'antd'
-<<<<<<< HEAD
-import { ProductLabel } from '@/pages/Product/Lock/Lockstore'
-=======
 import { ProductLabel } from '@/pages/Product/Lock/LockStore'
->>>>>>> ce41012c72a93a1241284d7c982dc65b09393eba
 
 // import EditableForm from '@/components/EditableForm'
 

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

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