Merge pull request #1 from qq371219521/master

mergeBy梁峥嵘
qq
Merge pull request #7 from zhiyao998/master

7月8日by梁峥嵘