billtemplate changge
Merge branch 'master' of https://github.com/chengcm2011/pipp

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/cheng/pipp/pom.properties