Fixed the ui bug for city-college page
Finished the popup of book dormitory
Merge code
Rebase code
Revert "Rebase code"

This reverts commit 984df551eb916ff75597ecaa6e8fdfa126f5b5af.
Revert "Merge code"

This reverts commit 8b658bd81d74d12f20b17c2aa23415ac4dbbcb7b.
Revert "Finished the popup of book dormitory"

This reverts commit 7b1b0c9350cdc9f8811af78789d309dd34f5238d.
Revert "Fixed the ui bug for city-college page"

This reverts commit 0850a7755e3ff5c24b593e8f82c662e4b0281ec2.
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory.git