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

chenyabin

2021-03-31 2c17820e9807507c5bcf111f2bf96bf9b1e077f6

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