调试完成物业投诉、报修、房屋交易、物业账单模块
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/com/wb/sc/bean/User.java
Merge remote-tracking branch 'choose_remote_name/master'