Merge pull request #2 from piercalex/master

2julie joe下午内页修改
test-1020
1020test
1020test revert
Merge pull request #3 from piercalex/master

joe ceshi
ignore clearn
Merge pull request #30 from chuyu123/master

1020 提交整合