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

chenyabin

2021-04-08 a7b7b5f1f85bd30b171e17056bf9ae9830fb36cb

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