难道筛选接口有问题还是我有问题？
Merge branch 'master' of https://github.com/tcmaster/OurProject

Conflicts:
	Joocola/src/com/android/joocola/app/JoocolaApplication.java