Merge commit 'a5f9255938fa83fb87c70427fcfd22386725eff1' into feature/zhaoxl
修改cucumber测试，改用FactoryGirl提供数据
Merge commit 'b3b2b37f58191cae0a940612493879ff8a0cbca9' into feature/zhaoxl
补的一些测试
Merge branch 'feature/zhaoxl' into develop