roll back
Revert "roll back"

This reverts commit 49042ad8931acbd9067e25617c53e5fa0d035a86.
Merge branch 'master' into NEW-MASTER
Merge branch 'NEW-MASTER' of git@github.com:zhengjiabin/ISharing.git into NEW-MASTER
几项微调
1）关于我们
2）navigation搜索
Merge branch 'NEW-MASTER' of git@github.com:zhengjiabin/ISharing.git into NEW-MASTER
注册检测学号