feat: 111

src/pages/Customer/Company/components/CompanyDetail/CompanyLowerList.jsx

@@ -4,7 +4,7 @@ import { dayjsFormat } from '@/utils/utils'
 const CompanyLowerList = props => {
   // const { toggleModal, setModalProps } = useModal()
   const {
-    log: { log: logs = [], total = 0 },
+    log: { log: logs = [] },
     servicelist
   } = props
   const servicelogEnum = {

src/pages/Customer/Company/components/CompanyDetail/index.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react'
 import { Row, Col, Spin, Tooltip } from 'antd'
 import consts from '@/consts'
 import { apiCompanyDetail } from '@/services/customer'
-import CompanyForm from './CompanyForm'
-import CompanyLowerList from './CompanyLowerList'
-import CompanyTabList from './CompanyTabList'
+import CompanyForm from './Form'
+import CompanyLowerList from './LowerList'
+import CompanyTabList from './TabList'
 import { connect } from 'dva'
 import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'

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'