样式修改和阶段选择的bug修复
Merge branch 'refs/heads/develop'