更何况交换空间
Merge branch 'master' of https://github.com/81813780/Hospital.git

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
gk
Merge branch 'master' of https://github.com/81813780/Hospital.git

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/adapter/GroupDcAdviceAdapter.java
Merge branch 'master' of https://github.com/81813780/Hospital.git
gyug
套餐测试
合并前
Merge remote-tracking branch 'llloy/master'

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/ui/activity/GroupDcAdviceActivity.java