1. Fix UI bug
2. add pre step pickup order.
3. fix pickup order bug
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory