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

yangdelong

2021-04-07 7c3ff469d37be883d7634bb4261bc5d54c89d2a5

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