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

app/views/cooperative/laboratory_settings/edit.html.erb

@@ -145,7 +145,7 @@
           </thead>
           <tbody>
           <% (setting.navbar || setting.default_navbar).each do |nav| %>
-            <tr>
+            <tr style="<%= nav['name'] == '交流问答' ? 'display:none' : '' %>">
               <td><%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %></td>
               <td><%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %></td>
               <td class="text-center">