继续完善。
提交代码
Merge branch '2.x' of https://github.com/superleo-cn/pos-android.git into 2.x

Conflicts:
	src/com/android/common/MyTextUtils.java
	src/com/android/component/ui/DailypaySubmitComponent.java
解决合并