修正bug
Merge branch 'sug_develop' of github.com:aronezhang/ironmine into sug_develop