删除top页面中的提醒连接
Merge remote-tracking branch 'origin/master'
添加Jackson标签
添加Jackson标签
Merge remote-tracking branch 'origin/master'

Conflicts:
	ruclabmis-web/pom.xml
	ruclabmis-web/src/main/webapp/equipment/admin_left.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	ruclabmis-core/src/main/java/edu/ruc/labmgr/service/MessageService.java
代码提交