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

app/views/settings/show.json.jbuilder

@@ -57,4 +57,12 @@ json.setting do
 
   json.common @common
   json.third_party @third_party
+
+  if @top_system_notification.present?
+    json.system_notification do 
+      json.(@top_system_notification, :id, :subject, :sub_subject, :content)
+    end
+  else
+    json.system_notification nil
+  end
 end