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

Conflicts:
	ruclabmis-web/src/main/java/edu/ruc/labmgr/web/controller/equip/EquipmentController.java
代码提交
Merge remote-tracking branch 'origin/master'