我的书架显示
Merge branch 'origin/master'
完成书架显示，从书架移除
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/sjtu/onlinelibrary/web/book/BookController.java