团购完善

团购完善
Merge branch 'master' of https://github.com/xpf1003/FUTURE_DOOR

Conflicts:
	FutureDoor_end/FutureDoor_end/Common/FutureDoorService.m
	FutureDoor_end/FutureDoor_end/Common/NetWorkConstants.h
	FutureDoor_end/FutureDoor_end/Common/ParseJson.h
	FutureDoor_end/FutureDoor_end/Common/ParseJson.m
Merge branch 'master' of https://github.com/xpf1003/FUTURE_DOOR

Conflicts:
	FutureDoor_end/FutureDoor_end/Common/FutureDoorService.m
	FutureDoor_end/FutureDoor_end/Common/NetWorkConstants.h
	FutureDoor_end/FutureDoor_end/Common/ParseJson.h
	FutureDoor_end/FutureDoor_end/Common/ParseJson.m