Change-Id: I73392f46648c4feb40ac2b967d7617c3e0229ccc
Change-Id: Ib7de1e5dbbfca923b666a5726c3ffed3b146d71a
Merge branch 'master' of https://github.com/Hahn-/GdutExchange.git
Merge branch 'master' of https://github.com/Hahn-/GdutExchange.git
更新了用户管理   搜索还有一点没完成
Merge branch 'master' of https://github.com/Hahn-/GdutExchange.git

Conflicts:
	Public/js/Infocenter/product.js

Change-Id: I63ded75ff52cf581f4418631c4f0e4a68b60503a