v
Merge branch 'master' of https://github.com/visa188/visa

Conflicts:
	src/main/java/com/visa/common/util/VisaUtil.java