Merge pull request #6 from suntinghui/master

ss
4寸分辨率调整
Merge pull request #9 from liaojia/master

4寸调整