【界面】佳柔提出的问题修改了一一半
Merge remote-tracking branch 'origin/master'

Conflicts:

	Android_Client/SecondHandPlatformClient/bin/classes/zju/secondhandplatform/client/MyGoods.class