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

yangdelong

2021-05-29 71c663091d05b11c41f78d8e75cb8b3db63b9cbc

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