Merge pull request #3 from hitwhwlj/develop

修改 option
修正 ie6 提示
Merge branch 'fix_ie6'
fix 流程
Merge branch 'develop'
fix sql
rm truncate
Merge branch 'develop'
fix indent
Merge branch 'develop'
fix typo
fix 流程
fix
Merge branch 'hotfix'
add test
Merge pull request #4 from wangxiaomo/test

Test