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

chenyabin

2021-04-19 c7a549da66df42d4ec5c78ddf2cc138772616941

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