i-----------------
Merge branch 'master' of https://github.com/superleo-cn/pos-android
Merge branch 'master' of https://github.com/superleo-cn/pos-android
Merge branch 'master' of https://github.com/superleo-cn/pos-android
i ----------------
ii------
Merge branch 'master' of https://github.com/superleo-cn/pos-android