textfield
sinup
number
Merge branch 'master' of https://github.com/jiaoyuguanjia/jygj-ios

Conflicts:
	jygj.xcodeproj/project.pbxproj
signup
done
Merge branches 'master' and 'master' of https://github.com/jiaoyuguanjia/jygj-ios