修正from未定义的BUG
Merge branch 'master' of https://github.com/bigzhu/shuqian