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

chenyabin

2021-04-07 def7b22807fa8e81bff4a92429f039d6e2bb2ce2

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