Resolve merge conflict

游雁

2024-01-14 8912e0696af069de47646fdb8a9d9c4e086e88b3

1
2
3
4
5
6
7
8
9
10
11
import Mock from 'mockjs'
 
import getUserInfo from './user/getUserInfo.js'
import getMenuList from './user/getMenuList.js'
Mock.setup({
    timeout: 500
})
 
console.log('启动mock请求数据')
getUserInfo(Mock)
getMenuList(Mock)