FIX 合并主干分支代码并解决代码冲突

app/controllers/settings_controller.rb

@@ -5,6 +5,7 @@ class SettingsController < ApplicationController
     get_common_menu
     get_personal_menu
     get_third_party
+    get_top_system_notification
   end
 
   private
@@ -47,6 +48,10 @@ class SettingsController < ApplicationController
         url: EducoderOauth.oauth_url
       }
     end
+    
+    def get_top_system_notification
+      @top_system_notification = SystemNotification.is_top.first
+    end
 
     def get_site_url(key, value)
       key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value)