Merge branch 'esign-sve-merchant' of http://gitlab.gongsibao.com/jiangyong/zhichan into esign-sve-merchant