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

chenyabin

2021-04-07 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c

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