调整接口
Revert "调整接口"

This reverts commit e3d2ad4f9ab1a3a478a7b2cb47f363f8fa73173a.
Revert "接口调整"

This reverts commit 76119458ce7771bde6b52922f443ac18f8437a61.
提交
Merge branch 'master' of https://github.com/RongShu/ios_v

Conflicts:
	VPS.xcodeproj/project.pbxproj

VPS.xcworkspace/xcuserdata/rirongshu.xcuserdatad/xcdebugger/Breakpoints_
v2.xcbkptlist
	VPS/AppDelegate.m
	VPS/Base.lproj/Main_iPhone.storyboard