Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/views/colleges/statistics.html.erb

@@ -52,7 +52,7 @@
     <li class="active" index="1"><a href="javascript:void(0);">课堂</a></li>
     <li index="2"><a href="<%= student_shixun_college_path(@school) %>" data-remote="true">学生实训</a></li>
     <!--<li><a href="<%#= engineering_capability_college_path(@department) %>" data-remote="true">工程能力</a></li>-->
-    <li index="4"><a href="<%= student_eval_college_path(@school) %>" data-remote="true">学生测评</a></li>
+<!--    <li index="4"><a href="<%#= student_eval_college_path(@school) %>" data-remote="true">学生测评</a></li>-->
   </div>
 
   <div class="panelContent panelContent-1">