transform log to hive
merge
Merge branch 'master' of https://github.com/sunjue-heavyrain/ismartv_statistics

Conflicts:
	pom.xml