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

chenyabin

2021-05-13 ff1c7b9d724adedd8a7eefed931556d7e2db7a4c

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