组件升级
Merge pull request #3 from kissygalleryteam/master

Merge pull request #3 from mailzwj/master
Merge pull request #4 from mailzwj/master

Auto merge by kpm server