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

yangdelong

2021-05-29 de7390c66ef3e3fe316e804495a78d05a01f0160

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