i bug-116\117
Merge branch 'master' of https://github.com/superleo-cn/pos-android