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

chenyabin

2021-05-14 f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe

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