修改bug

—MapViewController 正确显示线路、地图点
—预约查询，修改未登录情况登录后的所有bug
修改bug

—MapViewController 正确显示线路、地图点
—预约查询，修改未登录情况登录后的所有bug
修改bug

解决：预约查询中，我的预约，网络有问题，无法刷新
修改bug

修改bug
Merge branch 'pr/3'

Conflicts:

ShanghaiNaturalHistoryMuseum.xcworkspace/xcshareddata/ShanghaiNaturalHis
toryMuseum.xccheckout

ShanghaiNaturalHistoryMuseum.xcworkspace/xcuserdata/michaellu.xcuserdata
d/UserInterfaceState.xcuserstate
	ShanghaiNaturalHistoryMuseum/DataManager.h
	ShanghaiNaturalHistoryMuseum/LookAndStudy/LookStudyViewController.m
	ShanghaiNaturalHistoryMuseum/ShanghaiNaturalHistoryMuseum-Prefix.pch