完成用户取消预约
查询用户预约订单的返回信息添加 reservationId
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/UserController.php
Merge confirmReserve cancelReserve