1 关于我们 愿望详情
Merge branches 'master' and 'master' of https://github.com/oppcat/CoProject

Conflicts:
	GoodWishes.xcodeproj/project.pbxproj
	GoodWishes/Classes/BaseViewController.m
	GoodWishes/Classes/Common/ViewManager.h
	GoodWishes/Classes/Common/ViewManager.m
	GoodWishes/Classes/Controllers/Hot/WishDetailViewController.m
	GoodWishes/Classes/Controllers/Intro/IntroHomeViewController.m
	GoodWishes/Classes/Controllers/Left/MyActionListViewController.m