Authored by weiqingting

Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh…

…op-fe2 into yohobuy-shop-dev-4.6-20160606
/**
* Created by yoho on 2016/6/16.
*/
... ...