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

chenyabin

2021-05-13 097581b136c5889c71c07fb6f17d2f2885ce5a78

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