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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

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