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

chenyabin

2021-05-13 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645

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