代码提交
Merge remote-tracking branch 'origin/master'

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