commit
Merge branch 'master' of https://github.com/porthis77/hzdemo-common