Merge pull request #3 from hitwhwlj/develop

修改 option
修正 ie6 提示
Merge branch 'fix_ie6'
fix 流程
Merge branch 'develop'
fix sql
Merge pull request #2 from wangxiaomo/master

流程改变