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

# Conflicts: # app/views/users/get_user_info.json.jbuilder
2026-05-22 04:35:45 +08:00 · 2022-08-30 18:14:17 +08:00
parent 1613cf7376 4b7c58b13f
commit d51bb7030f
26 changed files with 928 additions and 151 deletions
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -55,6 +55,7 @@
    <li>
      <%= sidebar_item_group('#setting-submenu', '网站建设', icon: 'cogs') do %>
        <li><%= sidebar_item(admins_faqs_path, 'FAQ', icon: 'question-circle', controller: 'admins-faqs') %></li>
+        <li><%= sidebar_item(admins_nps_path, 'NPS用户调研', icon: 'question-circle', controller: 'admins-nps') %></li>
      <% end %>
    </li>
    <li>