Conflicts: app/views/layouts/_user_courses.html.erb app/views/org_subfields/show.html.erb app/views/organizations/_subfield_list.html.erb app/views/users/_resource_share_for_orgs.html.erb
Conflicts: db/schema.rb
2.在组织配置-》栏目,增加栏目类型。