两个反馈，调整了代码逻辑
Merge branch 'master' of https://github.com/yilu282/Qsystem