versiion 6
Merge branch 'master' of
https://github.com/bridge168/DataValidationTest.git

Conflicts:
	src/test/java/com/taobao/shop/datatest/hbasedatavalidation/HelloTest.java