Merge remote-tracking branch 'origin/develop' into develop

zhangshuaibao

2021-04-12 188abb2598a9253b19762d0cf4c4b36db64bfe8b

1
2
3
4
import * as mapApi from './mapApi'
import * as mapUrl from './mapUrl'
 
export default Object.assign({}, mapApi, mapUrl)