将查找和新增联系人从UserController 移动 ContactPeopleController
233
Merge branch 'develop' of https://github.com/VincentBel/CheetahReg into develop
aaa
确定表 user、cotact_people 和 reservation_number_info 表的关系
完成搜索功能, 并且修改部分变量命名, 使之符合驼峰命名规则
通过科室查询医院；返回热门医院；返回信息中添加医院id和科室id
实现通过二级科室类别id和地区名称获取相关医院信息
Merge pull request #15 from Leobuaa/develop

完成搜索功能, 实现通过二级科室类别id和地区名称获取相关医院信息
Merge remote-tracking branch 'origin/develop' into develop
返回的联系人信息添加id
Merge remote-tracking branch 'zqh/develop' into develop

Conflicts:
	app/routes.php
热门医院；科室分级
conflict solved
Merge pull request #17 from Syzngit/develop

通过科室查询医院；返回热门医院；返回信息中添加医院id和科室id；热门医院；科室分级
添加联系人成功后返回的数据增加 联系人id
Merge remote-tracking branch 'origin/develop' into develop
修改完善特定科室信息的返回
完成执行预约功能
Merge branch 'develop' of https://github.com/VincentBel/CheetahReg into develop