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

yangdelong

2021-04-07 e8692ebf024715c922ca0e10f90dc3a1219862b0

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