点击输入框 显示下拉
Merge branch 'master' of https://github.com/qq30135878/LeZai-Android.git

Conflicts:
	src/com/pinche/Fragment/OrderFragment.java