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

wangqi

2021-04-14 d838248f54e3bcacf9c2a54f7dc692525af3c051

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