Merge branch 'dev_xucheng' into develop

2017-10-13 22:04:16 +08:00 · 2017-10-13 22:04:16 +08:00 · 27cf3bb3ce
parent f52960e2eb 99c86a6e76
commit 27cf3bb3ce
1 changed files with 1 additions and 1 deletions
--- a/app/views/managements/_departments_part_list.html.erb
+++ b/app/views/managements/_departments_part_list.html.erb
@ -27,7 +27,7 @@
         </span>
      </td>
      <td><%= schools.province %></td>
-      <td class="edu-txt-left"><%= ApplyAddSchools.where(:school_id => schools.id,:status => 1).map(&:address).join("-") %></td>
+      <td class="edu-txt-left"><%= schools.city %><%= schools.address %></td>
      <td><%= UserExtensions.where(:school_id => schools.id).count %></td>
      <td><%= schools.departments.count %></td>
      <td><%= format_time schools.created_at %></td>