修改
Merge branch '2.x' of https://github.com/superleo-cn/pos-android.git
into 2.x

Conflicts:
	.classpath