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

chenyabin

2021-04-07 7966904bb2c464e0a5c134e1d0df0d1e04a747f7

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