merge
Merge branch 'master' of https://github.com/superleo-cn/pos-android
提交代码。