基本验证
注册1
fix conflict
生成订单
Merge branch 'feature/build_order' into develop

Conflicts:
	db/seeds.rb
收益终止日期,收益起始日期 可以为空
增加修改网点id的功能
修改代码
dev sms
注册2
fix conflict
注册3
确认订单信息
Merge branch 'develop' into feature/build_order

Conflicts:
	spec/factories/users.rb
dev user authenticate
优化代码
获取用户综合信息
Merge branch 'develop' into feature/build_order
订单预约信息
注册 完