no message
注册页面，第二步注册
mergeDevelop
Merge branch 'develop'

* develop:
  注册页面，第二步注册
  no message

Conflicts:
	BuildingMaterials.xcworkspace/xcuserdata/Ariel.xcuserdatad/UserInterfaceState.xcuserstate