update:l1
update:l2222222
update:confict
xxxx
Merge branch 'master' of git@github.com:YuanZhencai/example.git

Conflicts:
	src/main/java/com/wcs/compress/util/CompressUtil.java