dev
parent
158619e907
commit
f2e0248fc6
|
@ -25,11 +25,8 @@ import gzDict from './gzaiBox/dict'
|
||||||
import plan from './plan/index'
|
import plan from './plan/index'
|
||||||
import periodical from './periodical/index'
|
import periodical from './periodical/index'
|
||||||
import engin from './engin'
|
import engin from './engin'
|
||||||
<<<<<<< .mine
|
|
||||||
import tower from './device/tower/index'
|
import tower from './device/tower/index'
|
||||||
=======
|
|
||||||
import quality from './quality'
|
import quality from './quality'
|
||||||
>>>>>>> .theirs
|
|
||||||
import {axios,download} from '@/utils/request'
|
import {axios,download} from '@/utils/request'
|
||||||
export default {
|
export default {
|
||||||
project,
|
project,
|
||||||
|
@ -60,11 +57,7 @@ export default {
|
||||||
downFile:download,
|
downFile:download,
|
||||||
engin,
|
engin,
|
||||||
gzAiBoxVideo,
|
gzAiBoxVideo,
|
||||||
<<<<<<< .mine
|
|
||||||
gzDict,
|
|
||||||
tower
|
|
||||||
=======
|
|
||||||
gzDict,
|
gzDict,
|
||||||
|
tower,
|
||||||
quality
|
quality
|
||||||
>>>>>>> .theirs
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue