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

app/views/ec_years/requirement_vs_objective.html.erb

@@ -23,7 +23,7 @@
       </tr>
       <% @requirements.each_with_index do |req, index| %>
         <tr class="sustainLine editTd">
-          <td data-tip-down="<%= req.content %>"><%= index+1 %></td>
+          <td data-tip-down="<%= req.content %>">指标点<%= index+1 %></td>
           <% @subitem_objectives.each do |to| %>
             <% checked = EcRequirementVsObjective.where(:ec_graduation_requirement_id => req.id, :ec_training_objective_id => to.id).first %>
             <td data-tip-down="<%= checked && checked.status ? "取消支撑" : "选择支撑" %>" data-req-id="<%= req.id %>" data-to-id="<%= to.id %>">