Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant
