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

wangqi

2021-04-16 b0cb4ea7d287fffe598b42f189e6d6e6f06f3d40

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