解决冲突

Signed-off-by: kingbird <jiapumin@163.com>
Merge branch 'master' of https://github.com/jiapumin/qnssy

Signed-off-by: kingbird <jiapumin@163.com>

Conflicts:
	qnssy/qnssy.xcodeproj/project.pbxproj
签到接口实现

Signed-off-by: kingbird <jiapumin@163.com>