选择题可以暂停，界面修正。
解决冲突
Merge branch 'dev' of github.com:wwb443872831/Java3Group1 into dev