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

chenyabin

2021-03-31 2596ad89b4a57d2129f0a58cbc77d364eeaf412d

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