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

chenyabin

2021-04-13 1bf1ebe9830b985185c19a4de442e9596c1d1f29

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