合并李飞代码
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1